* Removed some weird const

[modest] / src / modest-email-clipboard.c

diff --git a/src/modest-email-clipboard.c b/src/modest-email-clipboard.c
index e3b489a..878718a 100644 (file)
--- 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
@@ -119,13 +119,10 @@ modest_email_clipboard_finalize (GObject * obj)
 
 
 ModestEmailClipboard *
-modest_email_clipboard_new ()
+modest_email_clipboard_new (void)
 {
        GObject *obj;
-       ModestEmailClipboardPrivate *priv;
-
        obj = G_OBJECT (g_object_new (MODEST_TYPE_EMAIL_CLIPBOARD, NULL));
-       priv = MODEST_EMAIL_CLIPBOARD_GET_PRIVATE (obj);
        
        return MODEST_EMAIL_CLIPBOARD (obj);
 }
@@ -247,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;
@@ -281,6 +276,10 @@ modest_email_clipboard_check_source_folder (ModestEmailClipboard *self,
        id2 = tny_folder_get_id (TNY_FOLDER(folder));   
        folder_type1 = modest_tny_folder_guess_folder_type (priv->src);
        folder_type2 = modest_tny_folder_guess_folder_type (folder);
+       
+       if (folder_type1 == TNY_FOLDER_TYPE_INVALID || folder_type2 == TNY_FOLDER_TYPE_INVALID)
+               g_warning ("%s: BUG: folder of type TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
+       
        same_folder = ((folder_type1 == folder_type2) && 
                       (!g_ascii_strcasecmp (id1, id2)));