X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-email-clipboard.c;h=878718abed13d46696e5194f65e657ff945cfed1;hb=2b1c5fd803436d4b0149fd531702f5246fbee3c0;hp=933f09eee859ee4e05111234c4bbe01efa713ed9;hpb=e8252c344da5952415930f7ae438320a695b3f16;p=modest

diff --git a/src/modest-email-clipboard.c b/src/modest-email-clipboard.c
index 933f09e..878718a 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,20 +244,18 @@ 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;
 }
 
 gboolean 
 modest_email_clipboard_check_source_folder (ModestEmailClipboard *self,
-					    const TnyFolder *folder)
+					    TnyFolder *folder)
 {
 	TnyFolderType folder_type1;
 	TnyFolderType folder_type2;