2007-09-28 [colin] 3.0.1cvs40
authorColin Leroy <colin@colino.net>
Fri, 28 Sep 2007 16:20:10 +0000 (16:20 +0000)
committerColin Leroy <colin@colino.net>
Fri, 28 Sep 2007 16:20:10 +0000 (16:20 +0000)
* src/folder_item_prefs.c
* src/ldaputil.c
* src/mainwindow.c
* src/mimeview.c
* src/common/tags.c
Fix warnings

ChangeLog
PATCHSETS
configure.ac
src/common/tags.c
src/folder_item_prefs.c
src/ldaputil.c
src/mainwindow.c
src/mimeview.c

index 6f74b4f1296e6673ac856fdb83f33d1bd7fe71e5..edbf86c8c6330767f668d183d03556f36f815553 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-09-28 [colin]     3.0.1cvs40
+
+       * src/folder_item_prefs.c
+       * src/ldaputil.c
+       * src/mainwindow.c
+       * src/mimeview.c
+       * src/common/tags.c
+               Fix warnings
+
 2007-09-28 [colin]     3.0.1cvs39
 
        * src/plugins/spamassassin/spamassassin.c
index f0acd6813922f0fa0548cf79bdbeec0999c5da80..a4bc115e15f801b661fb75652d64b44a20838032 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.52.2.51 -r 1.52.2.52 src/prefs_folder_item.c;  ) > 3.0.1cvs37.patchset
 ( cvs diff -u -r 1.213.2.163 -r 1.213.2.164 src/folder.c;  ) > 3.0.1cvs38.patchset
 ( cvs diff -u -r 1.18.2.56 -r 1.18.2.57 src/plugins/spamassassin/spamassassin.c;  cvs diff -u -r 1.4.2.17 -r 1.4.2.18 src/plugins/spamassassin/spamassassin.h;  cvs diff -u -r 1.23.2.41 -r 1.23.2.42 src/plugins/spamassassin/spamassassin_gtk.c;  ) > 3.0.1cvs39.patchset
+( cvs diff -u -r 1.2.2.23 -r 1.2.2.24 src/folder_item_prefs.c;  cvs diff -u -r 1.1.4.14 -r 1.1.4.15 src/ldaputil.c;  cvs diff -u -r 1.274.2.213 -r 1.274.2.214 src/mainwindow.c;  cvs diff -u -r 1.83.2.115 -r 1.83.2.116 src/mimeview.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/common/tags.c;  ) > 3.0.1cvs40.patchset
index 35e81152ef54ea4afa514e78c4681d812ad7bdf5..7f0e583d4f5df0b1c430e910963da1caa0ac1ef2 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=39
+EXTRA_VERSION=40
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 970b37a28c0e268cc8f28d7530a4aa72b0a0ccb6..5457de0ec4e52e7b248707bb12ce5d8c4208fead 100644 (file)
@@ -69,7 +69,7 @@ void tags_read_tags(void)
                fclose(fp);
                return;
        }
-       while (fgets(&tmp, sizeof(tmp), fp) != NULL) {
+       while (fgets(tmp, sizeof(tmp), fp) != NULL) {
                gchar *sep = strchr(tmp, '\t');
                gchar *tag_name = sep?(sep+1):NULL;
                
index b5ac2e790b45d15d99385a135bc55eb096b05f08..320420dfc372d8827ebf8f7e873d7e67b746ba3f 100644 (file)
@@ -184,8 +184,6 @@ static gboolean folder_item_prefs_save_config_func(GNode *node, gpointer data)
 
 void folder_item_prefs_save_config_recursive(FolderItem * item)
 {      
-       gchar * id;
-
        g_node_traverse(item->node, G_PRE_ORDER, G_TRAVERSE_ALL,
                        -1, folder_item_prefs_save_config_func, NULL);
 }
index 6186640906bd314f08f3d12b02f985ea3fb37420..72fcef416dd6de9c997cd9665f213dfcb84e7624 100644 (file)
@@ -210,6 +210,9 @@ int claws_ldap_simple_bind_s( LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *pa
                NULL, NULL, NULL );
 }
 
+/* from ldapsrc.c */
+void ldapsrv_set_options (gint secs, LDAP *ld);
+
 /**
  * Attempt to discover the base DN for the server.
  * \param  host   Host name.
index 3c54985a0f46344806c80b284757e55c6859215d..fc152e75b43f8761f7e19f552794f56ed34a1c1a 100644 (file)
@@ -4228,9 +4228,7 @@ static void account_receive_menu_cb(GtkMenuItem *menuitem, gpointer data)
 
 static void account_compose_menu_cb(GtkMenuItem *menuitem, gpointer data)
 {
-       MainWindow *mainwin = (MainWindow *)mainwin_list->data;
        PrefsAccount *account = (PrefsAccount *)data;
-       FolderItem *item = mainwin->summaryview->folder_item;   
 
        compose_new_with_folderitem(account, NULL, NULL);
 }
index 537b5d7f4d8f775f7d9472c795118e0014aea332..01e1082f68eb500b15ed38388ffe29082cada970 100644 (file)
@@ -1883,7 +1883,7 @@ static void mimeview_open_part_with(MimeView *mimeview, MimeInfo *partinfo, gboo
                prefs_common.mime_open_cmd_history =
                        add_history(prefs_common.mime_open_cmd_history, cmd);
        }
-out:
+
        g_free(content_type);
        g_free(filename);
 }