Changeset 213

Timestamp:

05/03/06 15:18:22

Author:

pvanhoof

Message:

Little fix

Files:

• trunk/libtinymail-camel/tny-account.c (modified) (6 diffs)
• trunk/libtinymail-camel/tny-camel-common.c (modified) (5 diffs)
• trunk/libtinymail-camel/tny-camel-stream.c (modified) (2 diffs)
• trunk/libtinymail-camel/tny-msg-folder.c (modified) (21 diffs)
• trunk/libtinymail-camel/tny-session-camel.c (modified) (18 diffs)
• trunk/libtinymail-camel/tny-store-account.c (modified) (2 diffs)
• trunk/libtinymail-camel/tny-stream-camel.c (modified) (1 diff)
• trunk/libtinymail-camel/tny-transport-account.c (modified) (2 diffs)
• trunk/libtinymailui-gtk/tny-attach-list-model.c (modified) (1 diff)
• trunk/libtinymailui-gtk/tny-msg-header-list-model.c (modified) (6 diffs)
• trunk/libtinymailui-gtk/tny-msg-view.c (modified) (11 diffs)
• trunk/libtinymailui-gtk/tny-text-buffer-stream.c (modified) (1 diff)
• trunk/tinymail/tny-account-store.c (modified) (11 diffs)
• trunk/tinymail/tny-summary-window.c (modified) (11 diffs)

trunk/libtinymail-camel/tny-account.c

@@ -82 +82 @@
-        g_static_rec_mutex_lock (priv->service_lock);
-
-priv->id
+G_UNLIKELY (priv->id)
-                g_free (priv->id);
-
@@ -99 +99 @@
-        g_static_rec_mutex_lock (priv->service_lock);
-
-priv->proto
+G_UNLIKELY (priv->proto)
-                g_free (priv->proto);
-
@@ -118 +118 @@
-        g_static_rec_mutex_lock (priv->service_lock);
-
-priv->user
+G_UNLIKELY (priv->user)
-                g_free (priv->user);
-
@@ -137 +137 @@
-        g_static_rec_mutex_lock (priv->service_lock);
-
-priv->host
+G_UNLIKELY (priv->host)
-                g_free (priv->host);
-
@@ -160 +160 @@
-        priv->pass_func_set = TRUE;
-
-!TNY_ACCOUNT_GET_CLASS (self)->reconnect_func
+G_UNLIKELY (!TNY_ACCOUNT_GET_CLASS (self)->reconnect_func)
-                g_error ("This TnyAccountIface instance isn't a fully implemented type\n");
-
@@ -328 +328 @@
-
-        g_static_rec_mutex_lock (priv->service_lock);
-priv->id
+G_LIKELY (priv->id)
-                g_free (priv->id);
-
-priv->user
+G_LIKELY (priv->user)
-                g_free (priv->user);
-
-priv->host
+G_LIKELY (priv->host)
-                g_free (priv->host);
-
-priv->proto
+G_LIKELY (priv->proto)
-                g_free (priv->proto);
+
-        g_static_rec_mutex_unlock (priv->service_lock);
-

trunk/libtinymail-camel/tny-camel-common.c

@@ -28 +28 @@
-        stfnd = strchr (tok, '<');
-        
-stfnd
+G_LIKELY (stfnd)
-        {
-                char *name = (char*)tok, *lname = NULL;
@@ -37 +37 @@
-                gtfnd = strchr (stfnd, '>');
-        
-!gtfnd
+G_UNLIKELY (!gtfnd)
-                {
-                        g_warning ("Invalid e-mail address in field");
@@ -46 +46 @@
-                *gtfnd = '\0';
-        
-*name == ' '
+G_LIKELY (*name == ' ')
-                        *name++;
-        
-*lname == ' '
+G_LIKELY (*lname == ' ')
-                        *lname-- = '\0';
-                camel_internet_address_add (target, name, email);
@@ -59 +59 @@
-                lname += (strlen (name)-1);
-
-*name == ' '
+G_LIKELY (*name == ' ')
-                        *name++;
-        
-*lname == ' '
+G_LIKELY (*lname == ' ')
-                        *lname-- = '\0';
-                camel_internet_address_add (target, NULL, name);
@@ -78 +78 @@
-        tok = strtok_r (dup, ",;", &save);
-
-tok != NULL
+G_LIKELY (tok != NULL)
-        {
-                

trunk/libtinymail-camel/tny-camel-stream.c

@@ -45 +45 @@
-        g_return_val_if_fail (TNY_IS_STREAM_IFACE (output), -1);
-
-
+
+
-                nb_read = camel_stream_read (stream, tmp_buf, sizeof (tmp_buf));
-nb_read < 0
+G_UNLIKELY (nb_read < 0)
-                        return -1;
-
+
+
-                        nb_written = 0;
-        
-
+
+
-                                ssize_t len = tny_stream_iface_write (output, tmp_buf + nb_written,
-                                                                  nb_read - nb_written);
-len < 0
+G_UNLIKELY (len < 0)
-                                        return -1;
-                                nb_written += len;
@@ -123 +126 @@
-        TnyCamelStream *self = (TnyCamelStream *)object;
-
-self->stream
+G_LIKELY (self->stream)
-                g_object_unref (G_OBJECT (self->stream));
-

trunk/libtinymail-camel/tny-msg-folder.c

@@ -78 +78 @@
-        gint count = 0;
-
-(count < 5) && list
+G_LIKELY ((count < 5) && list)
-        {
-                GList *element = list;
-element && element->data
+G_LIKELY (element && element->data)
-                        d->relaxed_func (element->data, NULL);
-                list = g_list_remove_link (list, element);
@@ -90 +90 @@
-        d->list = list;
-
-count <= 1
+G_UNLIKELY (count <= 1)
-                return FALSE;
-        
@@ -100 +100 @@
-tny_msg_folder_hdr_cache_uncacher (TnyMsgFolderPriv *priv)
-{
-priv->cached_hdrs
+G_LIKELY (priv->cached_hdrs)
-        {
-                RelaxedData *d = g_new (RelaxedData, 1);
@@ -118 +118 @@
-tny_msg_folder_hdr_cache_remover (TnyMsgFolderPriv *priv)
-{
-priv->cached_hdrs
+G_LIKELY (priv->cached_hdrs)
-        {
-                RelaxedData *d = g_new (RelaxedData, 1);
@@ -128 +128 @@
-                priv->cached_hdrs = NULL;
-                /* Speedup trick, also check tny-msg-header.c */
-priv->folder && priv->cached_uids
+G_LIKELY (priv->folder && priv->cached_uids)
-                        camel_folder_free_uids (priv->folder, priv->cached_uids);
-                priv->cached_uids = NULL;
@@ -145 +145 @@
-        g_mutex_lock (priv->folder_lock);
-
-priv->folder
+G_LIKELY (priv->folder)
-                camel_object_unref (CAMEL_OBJECT (priv->folder));
-        priv->folder = NULL;
-
-        g_mutex_lock (priv->cached_msgs_lock);
-priv->cached_msgs
+G_LIKELY (priv->cached_msgs)
-                g_hash_table_destroy (priv->cached_msgs);
-        priv->cached_msgs = NULL;
@@ -164 +164 @@
-{
-        g_mutex_lock (priv->folder_lock);
-!priv->folder
+G_LIKELY (!priv->folder)
-        {
-                CamelException ex = CAMEL_EXCEPTION_INITIALISER;
@@ -174 +174 @@
-                priv->has_summary_cap = camel_folder_has_summary_capability (priv->folder);
-
-priv->folder && priv->has_summary_cap
+G_LIKELY (priv->folder) && G_LIKELY (priv->has_summary_cap)
-                {
-                        priv->unread_length = (guint)
@@ -244 +244 @@
-
-        /* These will synchronize me using _tny_msg_folder_set_subscribed_priv */
-
+
+
-                tny_store_account_iface_subscribe 
-                        (TNY_STORE_ACCOUNT_IFACE (priv->account), self);
@@ -364 +365 @@
-
-        g_mutex_lock (priv->cached_hdrs_lock);
-
+
+
-        {
-                GPtrArray *uids = NULL;
@@ -443 +445 @@
-
-        g_mutex_lock (priv->cached_msgs_lock);
-
-
-
+
+
+
+
-
-                priv->cached_msgs = g_hash_table_new_full 
@@ -456 +459 @@
-        }
-        
-!message
+G_LIKELY (!message)
-        {
-                CamelException *ex = camel_exception_new ();
@@ -498 +501 @@
-        const gchar *name = NULL;
-        
-!priv->cached_name
+G_UNLIKELY (!priv->cached_name)
-        {
-                load_folder (priv);
@@ -521 +524 @@
-        TnyMsgFolderPriv *priv = TNY_MSG_FOLDER_GET_PRIVATE (TNY_MSG_FOLDER (self));
-
-priv->folder_name
+G_UNLIKELY (priv->folder_name)
-                g_free (priv->folder_name);
-
@@ -535 +538 @@
-        TnyMsgFolderPriv *priv = TNY_MSG_FOLDER_GET_PRIVATE (TNY_MSG_FOLDER (self));
-
-priv->cached_name
+G_UNLIKELY (priv->cached_name)
-                g_free (priv->cached_name);
-
@@ -552 +555 @@
-        camel_folder_rename (priv->folder, name);
-
-priv->cached_name
+G_UNLIKELY (priv->cached_name)
-                g_free (priv->cached_name);
-
@@ -573 +576 @@
-        g_mutex_lock (priv->folder_lock);
-        
-priv->folder
+G_UNLIKELY (priv->folder)
-                camel_object_unref (priv->folder);
-
@@ -659 +662 @@
-        TnyMsgFolderPriv *priv = TNY_MSG_FOLDER_GET_PRIVATE (self);
-
-priv->folders
+G_LIKELY (priv->folders)
-        {
-                g_mutex_lock (priv->folders_lock);
@@ -669 +672 @@
-
-        g_mutex_lock (priv->cached_hdrs_lock);
-priv->folder
+G_LIKELY (priv->folder)
-        {
-                g_mutex_lock (priv->folder_lock);
@@ -677 +680 @@
-        g_mutex_unlock (priv->cached_hdrs_lock);
-
-priv->cached_name
+G_LIKELY (priv->cached_name)
-                g_free (priv->cached_name);
-
@@ -704 +707 @@
-        TnyMsgFolderPriv *priv = TNY_MSG_FOLDER_GET_PRIVATE (self);
-
-priv->folder != NULL
+G_LIKELY (priv->folder != NULL)
-                unload_folder (priv);
-

trunk/libtinymail-camel/tny-session-camel.c

@@ -89 +89 @@
-        CamelService *service = (CamelService*)_tny_account_get_service (TNY_ACCOUNT (account));
-
-copy
+G_LIKELY (copy)
-        {
-                pf = copy->data;
-
-pf->service == NULL || pf->account == NULL
+G_UNLIKELY (pf->service == NULL) || G_UNLIKELY (pf->account == NULL)
-                {
-                        mark_del = g_list_append (mark_del, copy);
@@ -99 +99 @@
-                }
-
-pf->service == service
+G_UNLIKELY (pf->service == service)
-                {
-                        found = TRUE;
@@ -108 +108 @@
-        }
-
-!found
+G_UNLIKELY (!found)
-                pf = g_new0 (PrivForgetPassFunc, 1);
-
@@ -115 +115 @@
-        pf->service = service;
-
-!found
+G_UNLIKELY (!found)
-                forget_password_funcs = g_list_append (forget_password_funcs, pf);
-
-
-
+
+
+
-                {
-                        forget_password_funcs = g_list_remove (forget_password_funcs, mark_del->data);
@@ -125 +126 @@
-                }
-
-
+
+
-
-        return;
@@ -150 +152 @@
-        CamelService *service = (CamelService*)_tny_account_get_service (TNY_ACCOUNT (account));
-
-copy
+G_LIKELY (copy)
-        {
-                pf = copy->data;
-
-pf->service == NULL || pf->account == NULL
+G_UNLIKELY (pf->service) == NULL || G_UNLIKELY (pf->account == NULL)
-                {
-                        mark_del = g_list_append (mark_del, copy);
@@ -160 +162 @@
-                }
-
-pf->service == service
+G_UNLIKELY (pf->service == service)
-                {
-                        found = TRUE;
@@ -169 +171 @@
-        }
-
-!found
+G_UNLIKELY (!found)
-                pf = g_new0 (PrivPassFunc, 1);
-
@@ -176 +178 @@
-        pf->service = service;
-
-!found
+G_UNLIKELY (!found)
-                password_funcs = g_list_append (password_funcs, pf);
-
-
-
+
+
+
-                {
-                        password_funcs = g_list_remove (password_funcs, mark_del->data);
@@ -186 +189 @@
-                }
-
-
+
+
-
-        return;
@@ -201 +205 @@
-        gchar *retval = NULL;
-
-copy
+G_LIKELY (copy)
-        {
-                PrivPassFunc *pf = copy->data;
-
-pf->service == service
+G_UNLIKELY (pf->service == service)
-                {
-                        found = TRUE;
@@ -216 +220 @@
-        }
-
-found
+G_LIKELY (found)
-                retval = func (account, prompt);
-
-!retval
+G_UNLIKELY (!retval)
-                camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, "");
-
@@ -234 +238 @@
-        gboolean found = FALSE;
-
-copy
+G_LIKELY (copy)
-        {
-                PrivForgetPassFunc *pf = copy->data;
-
-pf->service == service
+G_UNLIKELY (pf->service == service)
-                {
-                        found = TRUE;
@@ -249 +253 @@
-        }
-
-found
+G_LIKELY (found)
-                func (account);
-
@@ -274 +278 @@
-        
-        url = camel_url_new (uri + offset, ex);
-
+
+
-        {
-                g_free(curi);
@@ -281 +286 @@
-
-        store = (CamelStore *)camel_session_get_service(session, uri+offset, CAMEL_PROVIDER_STORE, ex);
-store) 
+G_LIKELY (store))
-        {
-                const char *name;
@@ -288 +293 @@
-                {
-                        name = url->fragment;
-
-
+
-                        if (url->path && *url->path)
-                                name = url->path + 1;
@@ -402 +406 @@
-        gchar *camel_dir = NULL;
-
-camel_init (base_directory, TRUE) != 0
+G_LIKELY (camel_init (base_directory, TRUE) != 0)
-        {
-                g_error ("Critical ERROR: Cannot init %d as camel directory\n", base_directory);

trunk/libtinymail-camel/tny-store-account.c

@@ -53 +53 @@
-        TnyAccountPriv *priv = TNY_ACCOUNT_GET_PRIVATE (self);
-
-
+
+
-        {
-                CamelURL *url = NULL;
@@ -133 +134 @@
-        TnyStoreAccountPriv *priv = TNY_STORE_ACCOUNT_GET_PRIVATE (self);
-
-iter
+G_LIKELY (iter)
-        {
-                gboolean subscribed = TRUE;

trunk/libtinymail-camel/tny-stream-camel.c

@@ -64 +64 @@
-        g_return_val_if_fail (TNY_IS_STREAM_IFACE (output), -1);
-
-
+
+
-                nb_read = camel_stream_read (stream, tmp_buf, sizeof (tmp_buf));
-                if (G_UNLIKELY (nb_read < 0))
-                        return -1;
-
+
+
-                        nb_written = 0;
-        

trunk/libtinymail-camel/tny-transport-account.c

@@ -56 +56 @@
-        TnyAccountPriv *priv = TNY_ACCOUNT_GET_PRIVATE (self);
-
-priv->session && priv->proto && priv->host
+G_LIKELY (priv->session) && G_UNLIKELY (priv->proto) && G_UNLIKELY (priv->host)
-        {
-                GString *urlstr = g_string_new ("");
@@ -92 +92 @@
-                        apriv->url_string, &ex);
-
-transport && message && header
+G_LIKELY (transport && message && header)
-        {
-                CamelInternetAddress 

trunk/libtinymailui-gtk/tny-attach-list-model.c

@@ -69 +69 @@
-                tny_msg_mime_part_iface_get_content_type (part), 0, NULL);
-
-icon
+G_LIKELY (icon)
-        {
-                pixbuf = gtk_icon_theme_load_icon (priv->theme, icon, 
-                        GTK_ICON_SIZE_LARGE_TOOLBAR, 0, NULL);
-                g_free (icon);
-
-
-
+
+
-                        stock_file_pixbuf = gtk_icon_theme_load_icon (priv->theme, 
-                                GTK_STOCK_FILE, GTK_ICON_SIZE_LARGE_TOOLBAR, 

trunk/libtinymailui-gtk/tny-msg-header-list-model.c

@@ -87 +87 @@
-        list = g_list_nth (G_LIST (list_model->headers), i);
-
-i >= list_model->length
+G_UNLIKELY (i >= list_model->length)
-                return FALSE;
-                
@@ -109 +109 @@
-                list; list = list->next) 
-        {
-list == G_LIST (iter->user_data
+G_UNLIKELY (list == G_LIST (iter->user_data)
-                        break;
-                i++;
@@ -211 +211 @@
-tny_msg_header_list_model_iter_n_children (GtkTreeModel *self, GtkTreeIter *iter)
-{
-!iter
+G_LIKELY (!iter)
-                return TNY_MSG_HEADER_LIST_MODEL (self)->length;
-
@@ -222 +222 @@
-        GList *child;
-
-parent
+G_UNLIKELY (parent)
-                return FALSE;
-
-        child = g_list_nth (G_LIST (TNY_MSG_HEADER_LIST_MODEL (self)->headers), n);
-
-child) 
+G_LIKELY (child))
-        {
-                iter->stamp = TNY_MSG_HEADER_LIST_MODEL (self)->stamp;
@@ -247 +247 @@
-        header = G_LIST (iter->user_data)->data;
-        
-header
+G_LIKELY (header)
-                tny_msg_header_iface_uncache (header);
-
@@ -347 +347 @@
-        self->length = 0;
-
-self->folder
+G_LIKELY (self->folder)
-                g_object_unref (G_OBJECT (self->folder));
-

trunk/libtinymailui-gtk/tny-msg-view.c

@@ -79 +79 @@
-
-        gtk_text_buffer_set_text (headerbuffer, "", 0);
+        gtk_text_buffer_set_text (buffer, "", 0);
-
-        gtk_text_buffer_get_start_iter (headerbuffer, &hiter);
@@ -110 +111 @@
-
-
-parts
+G_LIKELY (parts)
-        {
-                TnyMsgMimePartIface *part = parts->data;
-
-tny_msg_mime_part_iface_content_type_is (part, "text/*"
+G_LIKELY (tny_msg_mime_part_iface_content_type_is (part, "text/*")
-                {
-                        tny_stream_iface_reset (dest);
@@ -122 +123 @@
-                        tny_msg_mime_part_iface_get_filename (part))
-                {
-first_attach
+G_UNLIKELY (first_attach)
-                        {
-                                model = tny_attach_list_model_new ();
@@ -136 +137 @@
-        }
-
-!first_attach
+G_LIKELY (!first_attach)
-        {
-                gtk_icon_view_set_model (priv->attachview, GTK_TREE_MODEL (model));
@@ -155 +156 @@
-                GNOME_VFS_OPEN_WRITE, FALSE, 0777);
-
-result != GNOME_VFS_OK
+G_UNLIKELY (result != GNOME_VFS_OK)
-                return result;
-
@@ -175 +176 @@
-        GtkTreeIter iter;
-
-gtk_tree_model_get_iter(model, &iter, path
+G_LIKELY (gtk_tree_model_get_iter(model, &iter, path)
-        {
-                TnyMsgMimePartIface *part;
@@ -183 +184 @@
-                        &part, -1);
-
-part
+G_LIKELY (part)
-                {
-                        GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (self));
-
-!GTK_WIDGET_TOPLEVEL (toplevel
+G_UNLIKELY (!GTK_WIDGET_TOPLEVEL (toplevel)
-                                return;
-
@@ -206 +207 @@
-                                tny_msg_mime_part_iface_get_filename (part));
-
-gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT
+G_LIKELY (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
-                        {
-                                gchar *uri;
@@ -243 +244 @@
-static gint
-tny_msg_view_popup_handler (GtkWidget *widget, GdkEvent *event)
-
-
-
-
-
-
+
-        g_return_val_if_fail (event != NULL, FALSE);
-        
-        menu = GTK_MENU (widget);
-        
-event->type == GDK_BUTTON_PRESS
+G_UNLIKELY (event->type == GDK_BUTTON_PRESS)
-        {
-
-
+
+
+
+
+
+
+
+
+
-                {
-                        gtk_menu_popup (menu, NULL, NULL, NULL, NULL, 
@@ -272 +274 @@
-        TnyMsgViewPriv *priv = TNY_MSG_VIEW_GET_PRIVATE (self);
-
-priv->msg
+G_LIKELY (priv->msg)
-                g_object_unref (G_OBJECT (priv->msg));
-
@@ -382 +384 @@
-        TnyMsgViewPriv *priv = TNY_MSG_VIEW_GET_PRIVATE (self);
-
-priv->msg
+G_LIKELY (priv->msg)
-                g_object_unref (G_OBJECT (priv->msg));
-

trunk/libtinymailui-gtk/tny-text-buffer-stream.c

@@ -48 +48 @@
-        ssize_t nb_written;
-        
-
+
+
-                nb_read = tny_stream_iface_read (self, tmp_buf, sizeof (tmp_buf));
-nb_read < 0
+G_UNLIKELY (nb_read < 0)
-                        return -1;
-nb_read > 0
+G_LIKELY (nb_read > 0)
-                        nb_written = 0;
-        
-
+
+
-                                ssize_t len = tny_stream_iface_write (output, tmp_buf + nb_written,
-                                                                  nb_read - nb_written);
-len < 0
+G_UNLIKELY (len < 0)
-                                        return -1;
-                                nb_written += len;

trunk/tinymail/tny-account-store.c

@@ -89 +89 @@
-        g_mutex_lock (priv->transport_accounts_lock);
-
-priv->store_accounts
+G_LIKELY (priv->store_accounts)
-                destroy_these_accounts (priv->store_accounts);
-
-priv->transport_accounts
+G_LIKELY (priv->transport_accounts)
-                destroy_these_accounts (priv->transport_accounts);
-
@@ -110 +110 @@
-        const gchar *accountid = tny_account_iface_get_id (account);
-
-!passwords
+G_UNLIKELY (!passwords)
-                passwords = g_hash_table_new (g_str_hash, g_str_equal);
-
-        retval = g_hash_table_lookup (passwords, accountid);
-
-!retval
+G_UNLIKELY (!retval)
-        {
-                GtkDialog *dialog = GTK_DIALOG (tny_password_dialog_new ());
@@ -122 +122 @@
-                        prompt);
-
-gtk_dialog_run (dialog) == GTK_RESPONSE_OK
+G_LIKELY (gtk_dialog_run (dialog) == GTK_RESPONSE_OK)
-                {
-                        const gchar *pwd = tny_password_dialog_get_password 
@@ -142 +142 @@
-per_account_forget_pass_func (TnyAccountIface *account)
-{
-passwords
+G_LIKELY (passwords)
-        {
-                const gchar *accountid = tny_account_iface_get_id (account);
@@ -148 +148 @@
-                gchar *pwd = g_hash_table_lookup (passwords, accountid);
-
-pwd) 
+G_LIKELY (pwd))
-                {
-                        memset (pwd, 0, strlen (pwd));
@@ -164 +164 @@
-        TnyAccountIface *found = NULL;
-
-accounts
+G_LIKELY (accounts)
-        {
-                TnyAccountIface *account = accounts->data;
-                const gchar *aid = tny_account_iface_get_id (account);
-                
-strcmp (key, aid)==0
+G_UNLIKELY (strcmp (key, aid) == 0)
-                {
-                        found = account;
-                        break;
-                }
+
-                accounts = g_list_next (accounts);
-        }
@@ -240 +241 @@
-        TnyAccountStorePriv *priv = TNY_ACCOUNT_STORE_GET_PRIVATE (self);
-
-!priv->cache_dir
+G_UNLIKELY (!priv->cache_dir)
-        {
-                /* Note that there's no listener for this key. If it changes,
@@ -345 +346 @@
-        const GList *retval;
-
-!priv->store_accounts
+G_UNLIKELY (!priv->store_accounts)
-                tny_account_store_get_all_accounts (self);
-
@@ -362 +363 @@
-        const GList *retval;
-
-!priv->transport_accounts
+G_UNLIKELY (!priv->transport_accounts)
-                tny_account_store_get_all_accounts (self);
-
@@ -504 +505 @@
-        priv->transport_accounts_lock = NULL;
-
-priv->cache_dir
+G_LIKELY (priv->cache_dir)
-                g_free (priv->cache_dir);
-
@@ -522 +523 @@
-        /* TODO: potential problem: singleton without lock */
-
-!the_singleton
+G_UNLIKELY (!the_singleton)
-        {
-                object = G_OBJECT_CLASS (parent_class)->constructor (type,