From: Paul Mangan Date: Sun, 6 May 2007 06:46:24 +0000 (+0000) Subject: 2007-05-06 [paul] 2.9.1cvs45 X-Git-Tag: rel_2_10_0~84 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=551d7219e7608bd4446f4b47576064047adc39d8 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 --- diff --git a/ChangeLog b/ChangeLog index 071eba49e..0d303ba38 100644 --- 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 diff --git a/PATCHSETS b/PATCHSETS index 0e84b89f4..d53a6c45f 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2572,3 +2572,4 @@ ( 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 diff --git a/configure.ac b/configure.ac index 56e486553..06d8e0daf 100644 --- a/configure.ac +++ b/configure.ac @@ -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= diff --git a/src/compose.c b/src/compose.c index 3a0d58a27..db7faf2d6 100644 --- a/src/compose.c +++ b/src/compose.c @@ -122,6 +122,7 @@ #include "message_search.h" #include "combobox.h" #include "hooks.h" +#include "privacy.h" enum { diff --git a/src/ldapquery.c b/src/ldapquery.c index cfef3ece4..3f9ebe6da 100644 --- a/src/ldapquery.c +++ b/src/ldapquery.c @@ -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; diff --git a/src/privacy.h b/src/privacy.h index be16b9ae4..d7ba1ebcf 100644 --- a/src/privacy.h +++ b/src/privacy.h @@ -104,4 +104,7 @@ struct _PrivacyData { PrivacySystem *system; }; +void privacy_inhibit_encrypt_warning (const gchar *id, + gboolean inhibit); + #endif /* PRIVACY_H */ diff --git a/src/summary_search.c b/src/summary_search.c index 4abed83e6..65830f585 100644 --- a/src/summary_search.c +++ b/src/summary_search.c @@ -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; diff --git a/src/summaryview.c b/src/summaryview.c index 793313ed3..99ded0428 100644 --- a/src/summaryview.c +++ b/src/summaryview.c @@ -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) {