libempathy-gtk: No need to 'egg' gcr-simple-certificate.[ch]

These are now properly distributed by libgcr.

4 files changed, 1 insertions, 197 deletions

diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index 72e489c75..423e41750 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -154,7 +154,6 @@ libempathy_gtk_headers =			\
 libempathy_gtk_la_SOURCES =			\
 	$(libempathy_gtk_handwritten_source)	\
 	$(libempathy_gtk_headers)		\
-	gcr-simple-certificate.c gcr-simple-certificate.h \
 	totem-subtitle-encoding.c totem-subtitle-encoding.h
 
 # do not distribute generated files
diff --git a/libempathy-gtk/empathy-tls-dialog.c b/libempathy-gtk/empathy-tls-dialog.c
index 9213ac458..3b5ec679d 100644
--- a/libempathy-gtk/empathy-tls-dialog.c
+++ b/libempathy-gtk/empathy-tls-dialog.c
@@ -26,7 +26,7 @@
 #include <gcr/gcr.h>
 #include <telepathy-glib/util.h>
 
-#include "gcr-simple-certificate.h"
+#include <gcr/gcr-simple-certificate.h>
 
 #define DEBUG_FLAG EMPATHY_DEBUG_TLS
 #include <libempathy/empathy-debug.h>
diff --git a/libempathy-gtk/gcr-simple-certificate.c b/libempathy-gtk/gcr-simple-certificate.c
deleted file mode 100644
index 072cbac97..000000000
--- a/libempathy-gtk/gcr-simple-certificate.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/* 
- * gnome-keyring
- * 
- * Copyright (C) 2008 Stefan Walter
- *
- * This file is copied from the gnome-keyring gcr library, which can be
- * found at git://git.gnome.org/gnome-keyring
- * 
- * This program is free software; you can redistribute it and/or modify 
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *  
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
- */
-
-#include "config.h"
-
-#include <gcr/gcr.h>
-#include "gcr-simple-certificate.h"
-
-#include <string.h>
-
-struct _GcrSimpleCertificatePrivate {
-	guchar *owned_data;
-	gsize n_owned_data;
-};
-
-static void gcr_certificate_iface (GcrCertificateIface *iface); 
-G_DEFINE_TYPE_WITH_CODE (GcrSimpleCertificate, gcr_simple_certificate, G_TYPE_OBJECT, 
-                         G_IMPLEMENT_INTERFACE (GCR_TYPE_CERTIFICATE, gcr_certificate_iface));
-
-/* -----------------------------------------------------------------------------
- * OBJECT 
- */
-
-static void
-gcr_simple_certificate_init (GcrSimpleCertificate *self)
-{
-	self->pv = G_TYPE_INSTANCE_GET_PRIVATE (self, GCR_TYPE_SIMPLE_CERTIFICATE, GcrSimpleCertificatePrivate);
-}
-
-static void
-gcr_simple_certificate_finalize (GObject *obj)
-{
-	GcrSimpleCertificate *self = GCR_SIMPLE_CERTIFICATE (obj);
-	
-	g_free (self->pv->owned_data);
-	self->pv->owned_data = NULL;
-	self->pv->n_owned_data = 0;
-
-	G_OBJECT_CLASS (gcr_simple_certificate_parent_class)->finalize (obj);
-}
-
-static void
-gcr_simple_certificate_set_property (GObject *obj, guint prop_id, const GValue *value, 
-                                     GParamSpec *pspec)
-{
-	switch (prop_id) {
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-gcr_simple_certificate_get_property (GObject *obj, guint prop_id, GValue *value, 
-                                     GParamSpec *pspec)
-{
-	switch (prop_id) {
-	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (obj, prop_id, pspec);
-		break;
-	}
-}
-
-static void
-gcr_simple_certificate_class_init (GcrSimpleCertificateClass *klass)
-{
-	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-    
-	gobject_class->finalize = gcr_simple_certificate_finalize;
-	gobject_class->set_property = gcr_simple_certificate_set_property;
-	gobject_class->get_property = gcr_simple_certificate_get_property;
-	
-	g_type_class_add_private (gobject_class, sizeof (GcrSimpleCertificatePrivate));
-}
-
-static const guchar* 
-gcr_simple_certificate_real_get_der_data (GcrCertificate *base, gsize *n_data)
-{
-	GcrSimpleCertificate *self = GCR_SIMPLE_CERTIFICATE (base);
-	
-	g_return_val_if_fail (GCR_IS_CERTIFICATE (self), NULL);
-	g_return_val_if_fail (n_data, NULL);
-	g_return_val_if_fail (self->pv->owned_data, NULL);
-	
-	/* This is called when we're not a base class */
-	*n_data = self->pv->n_owned_data;
-	return self->pv->owned_data;
-}
-
-static void 
-gcr_certificate_iface (GcrCertificateIface *iface) 
-{
-	iface->get_der_data = (gpointer)gcr_simple_certificate_real_get_der_data;
-}
-
-/* -----------------------------------------------------------------------------
- * PUBLIC 
- */
-
-GcrCertificate*
-gcr_simple_certificate_new (const guchar *data, gsize n_data)
-{
-	GcrSimpleCertificate *cert;
-	
-	g_return_val_if_fail (data, NULL);
-	g_return_val_if_fail (n_data, NULL);
-	
-	cert = g_object_new (GCR_TYPE_SIMPLE_CERTIFICATE, NULL);
-	
-	cert->pv->owned_data = g_memdup (data, n_data);
-	cert->pv->n_owned_data = n_data;
-	return GCR_CERTIFICATE (cert);
-}
diff --git a/libempathy-gtk/gcr-simple-certificate.h b/libempathy-gtk/gcr-simple-certificate.h
deleted file mode 100644
index ee46b4817..000000000
--- a/libempathy-gtk/gcr-simple-certificate.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* 
- * gnome-keyring
- * 
- * Copyright (C) 2008 Stefan Walter
- *
- * This file is copied from the gnome-keyring gcr library, which can be
- * found at git://git.gnome.org/gnome-keyring
- * 
- * This program is free software; you can redistribute it and/or modify 
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *  
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *  
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
- */
-
-#ifndef __GCR_SIMPLE_CERTIFICATE_H__
-#define __GCR_SIMPLE_CERTIFICATE_H__
-
-#include <gcr/gcr.h>
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define GCR_TYPE_SIMPLE_CERTIFICATE               (gcr_simple_certificate_get_type ())
-#define GCR_SIMPLE_CERTIFICATE(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GCR_TYPE_CERTIFICATE, GcrSimpleCertificate))
-#define GCR_SIMPLE_CERTIFICATE_CLASS(klass)       (G_TYPE_CHECK_CLASS_CAST ((klass), GCR_TYPE_CERTIFICATE, GcrSimpleCertificateClass))
-#define GCR_IS_SIMPLE_CERTIFICATE(obj)            (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GCR_TYPE_CERTIFICATE))
-#define GCR_IS_SIMPLE_CERTIFICATE_CLASS(klass)    (G_TYPE_CHECK_CLASS_TYPE ((klass), GCR_TYPE_CERTIFICATE))
-#define GCR_SIMPLE_CERTIFICATE_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj), GCR_TYPE_CERTIFICATE, GcrSimpleCertificateClass))
-
-typedef struct _GcrSimpleCertificate GcrSimpleCertificate;
-typedef struct _GcrSimpleCertificateClass GcrSimpleCertificateClass;
-typedef struct _GcrSimpleCertificatePrivate GcrSimpleCertificatePrivate;
-
-struct _GcrSimpleCertificate {
-	GObject parent;
-	GcrSimpleCertificatePrivate *pv;
-};
-
-struct _GcrSimpleCertificateClass {
-	GObjectClass parent_class;
-};
-
-GType               gcr_simple_certificate_get_type               (void);
-
-GcrCertificate*     gcr_simple_certificate_new                    (const guchar *data,
-                                                                   gsize n_data);
-
-G_END_DECLS
-
-#endif /* __GCR_SIMPLE_CERTIFICATE_H__ */