2005-10-27 [paul] 1.9.15cvs122
authorPaul Mangan <paul@claws-mail.org>
Thu, 27 Oct 2005 12:38:11 +0000 (12:38 +0000)
committerPaul Mangan <paul@claws-mail.org>
Thu, 27 Oct 2005 12:38:11 +0000 (12:38 +0000)
* src/folder.c
* src/prefs_account.c
fix building on Solaris
Patch by Alex Moore

ChangeLog-gtk2.claws
PATCHSETS
configure.ac
src/folder.c
src/prefs_account.c

index fd03654..554c0a2 100644 (file)
@@ -1,3 +1,10 @@
+2005-10-27 [paul]      1.9.15cvs122
+
+       * src/folder.c
+       * src/prefs_account.c
+               fix building on Solaris
+               Patch by Alex Moore
+
 2005-10-27 [wwp]       1.9.15cvs121
 
        * src/summaryview.c
index b9c658c..d4f4664 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.12.2.26 -r 1.12.2.27 src/action.c;  cvs diff -u -r 1.60.2.25 -r 1.60.2.26 src/prefs_actions.c;  ) > 1.9.15cvs119.patchset
 ( cvs diff -u -r 1.274.2.77 -r 1.274.2.78 src/mainwindow.c;  cvs diff -u -r 1.395.2.142 -r 1.395.2.143 src/summaryview.c;  ) > 1.9.15cvs120.patchset
 ( cvs diff -u -r 1.395.2.143 -r 1.395.2.144 src/summaryview.c;  cvs diff -u -r 1.1.4.11 -r 1.1.4.12 src/gtk/gtksctree.c;  ) > 1.9.15cvs121.patchset
+( cvs diff -u -r 1.213.2.67 -r 1.213.2.68 src/folder.c;  cvs diff -u -r 1.105.2.40 -r 1.105.2.41 src/prefs_account.c;  ) > 1.9.15cvs122.patchset
index 31a8b93..fbe7383 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=15
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=121
+EXTRA_VERSION=122
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 33153e5..352f1ba 100644 (file)
@@ -1648,7 +1648,7 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
        g_return_val_if_fail(folder != NULL, -1);
        g_return_val_if_fail(folder->klass->get_num_list != NULL, -1);
 
-       debug_print("Scanning folder %s for cache changes.\n", item->path);
+       debug_print("Scanning folder %s for cache changes.\n", item->path ? item->path : "(null)");
 
        /* Get list of messages for folder and cache */
        if (folder->klass->get_num_list(item->folder, item, &folder_list, &old_uids_valid) < 0) {
@@ -2302,8 +2302,8 @@ gint folder_item_fetch_all_msg(FolderItem *item)
        g_return_val_if_fail(item != NULL, -1);
        g_return_val_if_fail(item->no_select == FALSE, -1);
 
-       debug_print("fetching all messages in %s ...\n", item->path);
-       statusbar_print_all(_("Fetching all messages in %s ...\n"), item->path);
+       debug_print("fetching all messages in %s ...\n", item->path ? item->path : "(null)");
+       statusbar_print_all(_("Fetching all messages in %s ...\n"), item->path ? item->path : "(null)");
 
        folder = item->folder;
 
@@ -3670,7 +3670,8 @@ gboolean folder_has_parent_of_type(FolderItem *item,
                        && item != cur) {
                                debug_print("set item %s parent type to %d "
                                        "even if %s is F_INBOX\n",
-                                       item->path, 0, cur->path);
+                                       item->path ? item->path : "(null)",
+                                       0, cur->path);
                                item->parent_stype = F_NORMAL;
                                break;
                        }
@@ -3680,8 +3681,9 @@ gboolean folder_has_parent_of_type(FolderItem *item,
                                item->parent_stype = cur->parent_stype;
                                debug_print("set item %s parent type to %d "
                                        "from %s's parent type\n",
-                                       item->path, cur->parent_stype, 
-                                       cur->path);
+                                       item->path ? item->path : "(null)",
+                                       cur->parent_stype ? cur->parent_stype : 0, 
+                                       cur->path ? cur->path : "(null)");
                                break;
                        }
                        /* we found a parent that has a special type. That's 
@@ -3689,7 +3691,9 @@ gboolean folder_has_parent_of_type(FolderItem *item,
                        if (cur->stype != F_NORMAL) {
                                debug_print("set item %s parent type to %d "
                                        "from %s's type\n",
-                                       item->path, cur->stype, cur->path);
+                                       item->path ? item->path : "(null)",
+                                       cur->stype ? cur->stype : 0, 
+                                       cur->path ? cur->path : "(null)");
                                cur->parent_stype = cur->stype;
                                item->parent_stype = cur->stype;
                                break;
@@ -3701,7 +3705,7 @@ gboolean folder_has_parent_of_type(FolderItem *item,
                 * normal. */
                if (item->parent_stype == -1) {
                        debug_print("set item %s to 0 from default\n", 
-                               item->path);
+                               item->path ? item->path : "(null)");
                        item->parent_stype = F_NORMAL;
                }
        }
index 5a4ac6f..d087047 100644 (file)
@@ -2460,7 +2460,7 @@ static gint prefs_account_apply(void)
        if (protocol == A_IMAP4 || protocol == A_NNTP) 
                old_id = g_strdup_printf("#%s/%s",
                                protocol == A_IMAP4 ? "imap":"nntp",
-                               tmp_ac_prefs.account_name);
+                               tmp_ac_prefs.account_name ? tmp_ac_prefs.account_name : "(null)");
        
        prefs_set_data_from_dialog(param);