Changeset 3315

Show
Ignore:
Timestamp:
01/29/08 18:11:45
Author:
pvanhoof
Message:

Code cleanup

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/libtinymail-test/tny-folder-store-query-test.c

    r1322 r3315  
    4646tny_folder_store_query_test_setup (void) 
    4747{ 
    48     if (online_tests) 
    49     { 
    50         accounts = tny_simple_list_new (); 
    51         account_store = tny_test_account_store_new (TRUE, NULL); 
    52         tny_account_store_get_accounts (account_store, accounts,  
    53                         TNY_ACCOUNT_STORE_STORE_ACCOUNTS); 
    54         aiter = tny_list_create_iterator (accounts); 
    55         tny_iterator_first (aiter); 
    56          
    57         account = TNY_STORE_ACCOUNT (tny_iterator_get_current (aiter)); 
    58         g_object_unref (G_OBJECT (aiter)); 
    59  
    60         if (!account) 
    61                 online_tests = FALSE; 
    62    } 
    63     
    64    return; 
     48        if (online_tests) { 
     49                accounts = tny_simple_list_new (); 
     50                account_store = tny_test_account_store_new (TRUE, NULL); 
     51                tny_account_store_get_accounts (account_store, accounts,  
     52                                TNY_ACCOUNT_STORE_STORE_ACCOUNTS); 
     53                aiter = tny_list_create_iterator (accounts); 
     54                tny_iterator_first (aiter); 
     55                account = TNY_STORE_ACCOUNT (tny_iterator_get_current (aiter)); 
     56                g_object_unref (aiter); 
     57 
     58                if (!account) 
     59                        online_tests = FALSE; 
     60        } 
     61 
     62        return; 
    6563} 
    6664 
    …… 
    6866tny_folder_store_query_test_teardown (void) 
    6967{ 
    70         if (online_tests) 
    71         { 
    72                 g_object_unref (G_OBJECT (account));             
    73                 g_object_unref (G_OBJECT (accounts)); 
     68        if (online_tests) { 
     69                g_object_unref (account); 
     70                g_object_unref (accounts); 
    7471        } 
    7572        return; 
    …… 
    9592        tny_folder_store_get_folders (TNY_FOLDER_STORE (account), 
    9693                        folders, NULL, NULL); 
    97         length = tny_list_get_length (folders); 
    98      
    99         str = g_strdup_printf ("Root should have exactly one folder in the test account, it matches %d\n", length); 
    100         fail_unless (length == 1, str); 
    101         g_free (str); 
    102      
    103         if (length >= 1)  
    104         { 
    105                  
    106                 iter = tny_list_create_iterator (folders); 
    107                 folder = (TnyFolder *) tny_iterator_get_current (iter); 
    108                 tny_folder_store_get_folders (TNY_FOLDER_STORE (folder), 
    109                                 subfolders, query, NULL); 
    110                 g_object_unref (G_OBJECT (folder)); 
    111                 length = tny_list_get_length (subfolders); 
    112              
     94        length = tny_list_get_length (folders); 
     95 
     96        str = g_strdup_printf ("Root should have exactly one folder in the test account, it matches %d\n", length); 
     97        fail_unless (length == 1, str); 
     98        g_free (str); 
     99 
     100        if (length >= 1)  { 
     101                iter = tny_list_create_iterator (folders); 
     102                folder = (TnyFolder *) tny_iterator_get_current (iter); 
     103                tny_folder_store_get_folders (TNY_FOLDER_STORE (folder), 
     104                                subfolders, query, NULL); 
     105                g_object_unref (G_OBJECT (folder)); 
     106                length = tny_list_get_length (subfolders); 
    113107                str = g_strdup_printf ("^tny.*$ should match exactly one folder in the test account, it matches %d\n", length); 
    114108                fail_unless (tny_list_get_length (subfolders) == 1, str); 
    115                 g_free (str);       
    116                 g_object_unref (G_OBJECT (iter)); 
    117         } 
    118  
    119         g_object_unref (G_OBJECT (folders)); 
    120         g_object_unref (G_OBJECT (subfolders)); 
    121         g_object_unref (G_OBJECT (query)); 
    122      
     109                g_free (str); 
     110                g_object_unref (iter); 
     111        } 
     112 
     113        g_object_unref (folders); 
     114        g_object_unref (subfolders); 
     115        g_object_unref (query); 
     116 
    123117} 
    124118END_TEST 
    …… 
    131125        TnyFolder *folder; 
    132126        gint length=0; 
    133      
    134         if (!online_tests) 
    135                 return; 
    136      
     127 
     128        if (!online_tests) 
     129                return; 
     130 
    137131        query = tny_folder_store_query_new (); 
    138132        tny_folder_store_query_add_item (query, "^INBOX/tny.*$", TNY_FOLDER_STORE_QUERY_OPTION_MATCH_ON_ID); 
    …… 
    143137        tny_folder_store_get_folders (TNY_FOLDER_STORE (account), 
    144138                        folders, NULL, NULL); 
    145         length = tny_list_get_length (folders); 
    146      
    147         str = g_strdup_printf ("Root should have exactly one folder in the test account, it matches %d\n", length); 
    148         fail_unless (length == 1, str); 
    149         g_free (str); 
    150      
    151         if (length >= 1)  
    152         {        
    153                 iter = tny_list_create_iterator (folders); 
    154                 folder = (TnyFolder *) tny_iterator_get_current (iter); 
    155                 tny_folder_store_get_folders (TNY_FOLDER_STORE (folder), 
    156                                 subfolders, query, NULL); 
    157                 g_object_unref (G_OBJECT (folder)); 
    158                 length = tny_list_get_length (subfolders); 
    159              
     139        length = tny_list_get_length (folders); 
     140 
     141        str = g_strdup_printf ("Root should have exactly one folder in the test account, it matches %d\n", length); 
     142        fail_unless (length == 1, str); 
     143        g_free (str); 
     144 
     145        if (length >= 1) { 
     146                iter = tny_list_create_iterator (folders); 
     147                folder = (TnyFolder *) tny_iterator_get_current (iter); 
     148                tny_folder_store_get_folders (TNY_FOLDER_STORE (folder), 
     149                                subfolders, query, NULL); 
     150                g_object_unref (G_OBJECT (folder)); 
     151                length = tny_list_get_length (subfolders); 
    160152                str = g_strdup_printf ("^INBOX/tny.*$ should match exactly one folder in the test account, it matches %d\n", length); 
    161153                fail_unless (tny_list_get_length (subfolders) == 1, str); 
    162                 g_object_unref (G_OBJECT (iter)); 
    163         } 
    164  
    165         g_object_unref (G_OBJECT (folders)); 
    166         g_object_unref (G_OBJECT (subfolders)); 
    167         g_object_unref (G_OBJECT (query)); 
     154                g_object_unref (iter); 
     155        } 
     156 
     157        g_object_unref (folders); 
     158        g_object_unref (subfolders); 
     159        g_object_unref (query); 
    168160} 
    169161END_TEST 

  • trunk/libtinymail-test/tny-folder-store-test.c

    r3141 r3315  
    3939tny_folder_store_test_setup (void) 
    4040{ 
    41      TnyIterator *aiter; 
    42      TnyList *accounts = tny_simple_list_new (); 
    43      TnyAccountStore *account_store = tny_test_account_store_new (TRUE, NULL); 
    44      tny_account_store_get_accounts (account_store, accounts, TNY_ACCOUNT_STORE_STORE_ACCOUNTS); 
    45      g_object_unref (account_store); 
    46      aiter = tny_list_create_iterator (accounts); 
    47      tny_iterator_first (aiter); 
    48      account = TNY_FOLDER_STORE (tny_iterator_get_current (aiter)); 
    49      g_object_unref (aiter); 
    50      g_object_unref (accounts); 
     41       TnyIterator *aiter; 
     42       TnyList *accounts = tny_simple_list_new (); 
     43       TnyAccountStore *account_store = tny_test_account_store_new (TRUE, NULL); 
     44       tny_account_store_get_accounts (account_store, accounts, TNY_ACCOUNT_STORE_STORE_ACCOUNTS); 
     45       g_object_unref (account_store); 
     46       aiter = tny_list_create_iterator (accounts); 
     47       tny_iterator_first (aiter); 
     48       account = TNY_FOLDER_STORE (tny_iterator_get_current (aiter)); 
     49       g_object_unref (aiter); 
     50       g_object_unref (accounts); 
    5151} 
    5252 

  • trunk/libtinymail-test/tny-folder-test.c

    r2032 r3315  
    7979                        g_object_ref (G_OBJECT (folder)); 
    8080                } 
    81              
    8281                recurse_folders (folder, query, folname, func); 
    83              
    84                 g_object_unref (G_OBJECT (folder)); 
    85  
    86                 tny_iterator_next (iter);            
    87         } 
    88  
    89         g_object_unref (G_OBJECT (iter)); 
    90         g_object_unref (G_OBJECT (folders)); 
     82                g_object_unref (folder); 
     83                tny_iterator_next (iter); 
     84        } 
     85 
     86        g_object_unref (iter); 
     87        g_object_unref (folders); 
    9188} 
    9289 
    …… 
    108105        g_object_unref (G_OBJECT (aiter)); 
    109106        g_object_unref (G_OBJECT (accounts)); 
    110          
     107 
    111108        recurse_folders (TNY_FOLDER_STORE (account), NULL, "INBOX/2000", do_test_folder); 
    112109 
    …… 
    117114tny_folder_test_teardown (void) 
    118115{ 
    119       if (iface) 
    120                g_object_unref (G_OBJECT (iface)); 
    121  
    122        g_object_unref (G_OBJECT (account)); 
     116      if (iface) 
     117               g_object_unref (iface); 
     118 
     119       g_object_unref (account); 
    123120 
    124121        return; 

  • trunk/libtinymail-test/tny-list-test.c

    r2571 r3315  
    212212        g_free (str); 
    213213 
    214         g_object_unref (G_OBJECT(item)); 
     214        g_object_unref (iterator); 
    215215 
    216216        /* What's the initial state of an iterator? */ 

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

    r3304 r3315  
    253253 *    tny_iterator_next (iter); 
    254254 * } 
    255  * g_object_unref (G_OBJECT (iter)); 
    256  * g_object_unref (G_OBJECT (list)); 
     255 * g_object_unref (iter); 
     256 * g_object_unref (list); 
    257257 * </programlisting></informalexample> 
    258258 * 
    …… 
    326326 *        tny_iterator_next (iter); 
    327327 *    } 
    328  *    g_object_unref (G_OBJECT (iter)); 
     328 *    g_object_unref (iter); 
    329329 *    tny_session_camel_set_initialized (session); 
    330330 * } 

  • trunk/libtinymail/tny-folder-store-change.c

    r3161 r3315  
    161161        } 
    162162 
    163         g_object_unref (G_OBJECT (iter)); 
     163        g_object_unref (iter); 
    164164 
    165165        g_mutex_unlock (priv->lock); 
    …… 
    207207        } 
    208208 
    209         g_object_unref (G_OBJECT (iter)); 
     209        g_object_unref (iter); 
    210210 
    211211        g_mutex_unlock (priv->lock); 

  • trunk/libtinymail/tny-folder.c

    r3304 r3315  
    445445 *             tny_iterator_next (iter); 
    446446 *         } 
     447 *         g_object_unref (iter); 
    447448 *         g_object_unref (headers); 
    448449 *     } 
    …… 
    824825 *             tny_iterator_next (iter); 
    825826 *         } 
     827 *         g_object_unref (iter); 
    826828 *         g_object_unref (headers); 
    827829 *     } 

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

    r3304 r3315  
    628628        } 
    629629 
    630         g_object_unref (G_OBJECT (iterator)); 
     630        g_object_unref (iterator); 
    631631 
    632632} 

  • trunk/tests/functional/account-refresh.c

    r2030 r3315  
    5454                tny_iterator_next (iter); 
    5555        } 
    56          g_object_unref (G_OBJECT (iter)); 
    57          g_object_unref (G_OBJECT (folders)); 
     56         g_object_unref (iter); 
     57         g_object_unref (folders); 
    5858} 
    5959 
    …… 
    100100                tny_iterator_next (iter); 
    101101        } 
    102         g_object_unref (G_OBJECT (iter)); 
     102        g_object_unref (iter); 
    103103 
    104104        /* Refresh folders */ 
    …… 
    121121                        g_clear_error (&error); 
    122122                } 
    123                 g_object_unref (G_OBJECT (folder)); 
     123                g_object_unref (folder); 
    124124                tny_iterator_next (iter); 
    125125        } 
    126         g_object_unref (G_OBJECT (iter)); 
     126        g_object_unref (iter); 
    127127 
    128128 out: 

  • trunk/tests/functional/folder-lister-async.c

    r3151 r3315  
    5151{ 
    5252        TnyIterator *iter = tny_list_create_iterator (list); 
    53      
     53 
    5454        while (!tny_iterator_is_done (iter)) 
    5555        { 
    5656                TnyFolderStore *folder = (TnyFolderStore*) tny_iterator_get_current (iter); 
    5757                TnyList *folders = tny_simple_list_new (); 
    58  
    5958                g_print ("%s\n", tny_folder_get_name (TNY_FOLDER (folder))); 
    60              
    6159                tny_folder_store_get_folders_async (folder, 
    6260                        folders, NULL, callback, NULL, NULL); 
    63              
    6461                g_object_unref (G_OBJECT (folder)); 
    65              
    66                 tny_iterator_next (iter);            
     62                tny_iterator_next (iter); 
    6763        } 
    6864 
    69         g_object_unref (G_OBJECT (iter)); 
    70         g_object_unref (G_OBJECT (list)); 
     65        g_object_unref (iter); 
     66        g_object_unref (list); 
    7167} 
    7268 
    …… 
    145141        } 
    146142     
    147         g_object_unref (G_OBJECT (account)); 
    148         g_object_unref (G_OBJECT (iter)); 
    149         g_object_unref (G_OBJECT (accounts)); 
     143        g_object_unref (account); 
     144        g_object_unref (iter); 
     145        g_object_unref (accounts); 
    150146     
    151147        return 0; 

  • trunk/tests/functional/folder-lister.c

    r2015 r3315  
    5858                recursion_level--; 
    5959             
    60                 g_object_unref (G_OBJECT (folder)); 
     60                g_object_unref (folder); 
    6161 
    6262                tny_iterator_next (iter); 
    6363        } 
    6464 
    65          g_object_unref (G_OBJECT (iter)); 
    66          g_object_unref (G_OBJECT (folders)); 
     65         g_object_unref (iter); 
     66         g_object_unref (folders); 
    6767} 
    6868 
    …… 
    113113                recurse_folders (TNY_FOLDER_STORE (account), NULL); 
    114114 
    115         g_object_unref (G_OBJECT (account)); 
    116         g_object_unref (G_OBJECT (iter)); 
    117         g_object_unref (G_OBJECT (accounts)); 
     115        g_object_unref (account); 
     116        g_object_unref (iter); 
     117        g_object_unref (accounts); 
    118118 
    119119        return 0; 

  • trunk/tests/functional/folder-transfer.c

    r2015 r3315  
    8787                recursion_level--; 
    8888             
    89                 g_object_unref (G_OBJECT (folder)); 
     89                g_object_unref (folder); 
    9090 
    9191                tny_iterator_next (iter); 
    9292        } 
    9393 
    94          g_object_unref (G_OBJECT (iter)); 
    95          g_object_unref (G_OBJECT (folders)); 
     94         g_object_unref (iter); 
     95         g_object_unref (folders); 
    9696} 
    9797 
    …… 
    157157 
    158158 cleanup: 
    159         g_object_unref (G_OBJECT (account)); 
    160         g_object_unref (G_OBJECT (iter)); 
    161         g_object_unref (G_OBJECT (accounts)); 
     159        g_object_unref (account); 
     160        g_object_unref (iter); 
     161        g_object_unref (accounts); 
    162162 
    163163        return 0; 

  • trunk/tests/memory/memory-test.c

    r2015 r3315  
    133133 
    134134        tny_folder_store_get_folders (TNY_FOLDER_STORE (inbox), folders, NULL, NULL); 
     135 
     136        if (iter) 
     137                g_object_unref (iter); 
    135138        iter = tny_list_create_iterator (folders); 
    136139