From: Jose Dapena Paz <jdapena@igalia.com>
Date: Tue, 20 Nov 2007 09:53:59 +0000 (+0000)
Subject: * src/modest-email-clipboard.[ch]:
X-Git-Tag: git_migration_finished~2055
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=3f9a58292264ddd8802e8a935a45c175bee2423d

* src/modest-email-clipboard.[ch]:
        * Now we have a permanent reference to private structure in
          ModestEmailClipboard instance. This is for retrieving this
          faster (we need this to improve speed of a frequent operation
          as modest_email_clipboard_cleared is).

pmo-trunk-r3776
---

diff --git a/src/modest-email-clipboard.c b/src/modest-email-clipboard.c
index 933f09e..1617621 100644
--- a/src/modest-email-clipboard.c
+++ b/src/modest-email-clipboard.c
@@ -38,7 +38,6 @@ static void modest_email_clipboard_finalize   (GObject * obj);
 /* globals */
 static GObjectClass *parent_class = NULL;
 
-typedef struct _ModestEmailClipboardPrivate ModestEmailClipboardPrivate;
 struct _ModestEmailClipboardPrivate {
 	TnyList    *selection;
 	TnyFolder  *src;	
@@ -57,7 +56,7 @@ modest_email_clipboard_get_type (void)
 {
 	static GType my_type = 0;
 
-	if (!my_type) {
+	if (G_UNLIKELY (!my_type)) {
 		static const GTypeInfo my_info = {
 			sizeof (ModestEmailClipboardClass),
 			NULL,	/* base init */
@@ -99,13 +98,14 @@ modest_email_clipboard_class_init (ModestEmailClipboardClass * klass)
 static void
 modest_email_clipboard_init (ModestEmailClipboard * obj)
 {
-	ModestEmailClipboardPrivate *priv =
-		MODEST_EMAIL_CLIPBOARD_GET_PRIVATE (obj);
+
+	if (obj->priv == NULL)
+		obj->priv = MODEST_EMAIL_CLIPBOARD_GET_PRIVATE (obj);
 	
-	priv->src = NULL;
-	priv->selection = NULL;
-	priv->hidding = NULL;
-	priv->delete = FALSE;
+	obj->priv->src = NULL;
+	obj->priv->selection = NULL;
+	obj->priv->hidding = NULL;
+	obj->priv->delete = FALSE;
 }
 
 static void
@@ -244,13 +244,11 @@ modest_email_clipboard_clear (ModestEmailClipboard *self)
 gboolean
 modest_email_clipboard_cleared (ModestEmailClipboard *self)
 {
-	ModestEmailClipboardPrivate *priv = NULL;;
 	gboolean cleared = FALSE;
 
 	g_return_val_if_fail (MODEST_IS_EMAIL_CLIPBOARD (self), TRUE);
-	priv = MODEST_EMAIL_CLIPBOARD_GET_PRIVATE (self);
 
-	cleared = ((priv->src == NULL) && (priv->selection == NULL));
+	cleared = ((self->priv->src == NULL) && (self->priv->selection == NULL));
 
 	return cleared;
 }
diff --git a/src/modest-email-clipboard.h b/src/modest-email-clipboard.h
index bf64969..9db2d92 100644
--- a/src/modest-email-clipboard.h
+++ b/src/modest-email-clipboard.h
@@ -48,9 +48,11 @@ G_BEGIN_DECLS
 
 typedef struct _ModestEmailClipboard      ModestEmailClipboard;
 typedef struct _ModestEmailClipboardClass ModestEmailClipboardClass;
+typedef struct _ModestEmailClipboardPrivate ModestEmailClipboardPrivate;
 
 struct _ModestEmailClipboard {
 	 GObject parent;
+	ModestEmailClipboardPrivate *priv;
 };
 
 struct _ModestEmailClipboardClass {