2007-05-06 [paul] 2.9.1cvs45
authorPaul Mangan <paul@claws-mail.org>
Sun, 6 May 2007 06:46:24 +0000 (06:46 +0000)
committerPaul Mangan <paul@claws-mail.org>
Sun, 6 May 2007 06:46:24 +0000 (06:46 +0000)
* src/compose.c
* src/ldapquery.c
* src/privacy.h
* src/summary_search.c
* src/summaryview.c
fix build warnings

ChangeLog
PATCHSETS
configure.ac
src/compose.c
src/ldapquery.c
src/privacy.h
src/summary_search.c
src/summaryview.c

index 071eba49ec923854c213564c0b7cb55a900556f9..0d303ba384fc82d9b8713504f3c6d10e41e9f0c7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-05-06 [paul]      2.9.1cvs45
+
+       * src/compose.c
+       * src/ldapquery.c
+       * src/privacy.h
+       * src/summary_search.c
+       * src/summaryview.c
+               fix build warnings
+
 2007-05-05 [wwp]       2.9.1cvs44
 
        * src/messageview.c
index 0e84b89f4cdf78bcf836381c6405899f5e80f332..d53a6c45f0abe4f3dac6c04ec6e90a458b7cdd5d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.395.2.299 -r 1.395.2.300 src/summaryview.c;  cvs diff -u -r 1.274.2.188 -r 1.274.2.189 src/mainwindow.c;  ) > 2.9.1cvs42.patchset
 ( cvs diff -u -r 1.382.2.375 -r 1.382.2.376 src/compose.c;  cvs diff -u -r 1.10.2.13 -r 1.10.2.14 src/privacy.c;  cvs diff -u -r 1.10.2.11 -r 1.10.2.12 src/privacy.h;  cvs diff -u -r 1.1.2.22 -r 1.1.2.23 src/plugins/pgpcore/prefs_gpg.c;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/plugins/pgpcore/prefs_gpg.h;  cvs diff -u -r 1.1.2.33 -r 1.1.2.34 src/plugins/pgpinline/pgpinline.c;  cvs diff -u -r 1.1.2.47 -r 1.1.2.48 src/plugins/pgpmime/pgpmime.c;  ) > 2.9.1cvs43.patchset
 ( cvs diff -u -r 1.94.2.132 -r 1.94.2.133 src/messageview.c;  cvs diff -u -r 1.79.2.54 -r 1.79.2.55 src/mh.c;  cvs diff -u -r 1.60.2.45 -r 1.60.2.46 src/prefs_actions.c;  cvs diff -u -r 1.10.2.29 -r 1.10.2.30 src/prefs_gtk.c;  cvs diff -u -r 1.395.2.300 -r 1.395.2.301 src/summaryview.c;  cvs diff -u -r 1.1.4.18 -r 1.1.4.19 src/common/xml.c;  ) > 2.9.1cvs44.patchset
+( cvs diff -u -r 1.382.2.376 -r 1.382.2.377 src/compose.c;  cvs diff -u -r 1.3.2.18 -r 1.3.2.19 src/ldapquery.c;  cvs diff -u -r 1.10.2.12 -r 1.10.2.13 src/privacy.h;  cvs diff -u -r 1.15.2.48 -r 1.15.2.49 src/summary_search.c;  cvs diff -u -r 1.395.2.301 -r 1.395.2.302 src/summaryview.c;  ) > 2.9.1cvs45.patchset
index 56e48655306b3247b5af3ef82319f0bd932bb768..06d8e0daf88c1409c13790dbb9a2f748054be35b 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=44
+EXTRA_VERSION=45
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 3a0d58a27a0481001d41746fe697bef7b20c9aa6..db7faf2d676f60f8e438191c891cd89308cf7e0b 100644 (file)
 #include "message_search.h"
 #include "combobox.h"
 #include "hooks.h"
+#include "privacy.h"
 
 enum
 {
index cfef3ece45a60976f5eb92409ad25f545892e466..3f9ebe6dabbab03ea745865e119fe0a142218f09 100644 (file)
@@ -439,7 +439,7 @@ static GList *ldapqry_build_items_fl(
 {
        GSList *nodeAddress, *cur;
        gchar *firstName = NULL, *lastName = NULL, *fullName = NULL;
-       gboolean allocated;
+       gboolean allocated = FALSE;
        ItemPerson *person;
        ItemEMail *email;
        ItemFolder *folder;
index be16b9ae43593cc81b34e1f4b2a1164c2bfef012..d7ba1ebcf5d468d6e2c56e149e94d0e3085b95a1 100644 (file)
@@ -104,4 +104,7 @@ struct _PrivacyData {
        PrivacySystem   *system;
 };
 
+void privacy_inhibit_encrypt_warning           (const gchar *id,
+                                                gboolean inhibit);
+
 #endif /* PRIVACY_H */
index 4abed83e69ca0e5ddee156696d05a0188b9b7b20..65830f585361c56f38fe6a2eeea90030ee38716c 100644 (file)
@@ -503,8 +503,9 @@ static void summary_search_execute(gboolean backward, gboolean search_all)
        gboolean all_searched = FALSE;
        gboolean matched = FALSE;
        gboolean body_matched = FALSE;
-       const gchar *from_str = NULL, *to_str = NULL, *subject_str = NULL;
-       const gchar *body_str = NULL, *adv_condition = NULL;
+       gchar *from_str = NULL, *to_str = NULL, *subject_str = NULL;
+       gchar *body_str = NULL;
+       gchar *adv_condition = NULL;
        StrFindFunc str_find_func = NULL;
        gboolean is_fast = TRUE;
        gint interval = 1000;
index 793313ed3a95f0602f581d4104525305754565f2..99ded0428ed77a366c69d399e85351dc902d8355 100644 (file)
@@ -256,9 +256,11 @@ static GtkWidget *summary_ctree_create     (SummaryView    *summaryview);
 static gint summary_toggle_pressed     (GtkWidget              *eventbox,
                                         GdkEventButton         *event,
                                         SummaryView            *summaryview);
+#ifdef MAEMO
 static void summary_toggle_multiple_pressed
                                        (GtkWidget              *widget,
                                         SummaryView            *summaryview);
+#endif
 static gint summary_folder_eventbox_pressed    
                                        (GtkWidget              *eventbox,
                                         GdkEventButton         *event,
@@ -5409,14 +5411,14 @@ static gint summary_toggle_pressed(GtkWidget *eventbox, GdkEventButton *event,
                summary_toggle_view(summaryview);
        return TRUE;
 }
-
+#ifdef MAEMO
 static void summary_toggle_multiple_pressed(GtkWidget *widget,
                                   SummaryView *summaryview)
 {
        GTK_SCTREE(summaryview->ctree)->force_additive_sel = 
                gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
 }
-
+#endif
 static gboolean summary_button_pressed(GtkWidget *ctree, GdkEventButton *event,
                                       SummaryView *summaryview)
 {