callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unfuzz

Browse Source 
git-svn-id: file:///svn/pkg-evolution/unstable/evolution@2790 ed03ce00-e4f4-0310-9448-ee38221cb277
This commit is contained in:
Iain Lane
2015-09-01 12:53:57 +00:00
parent fe95ec36cc
commit 6725c2982f
1 changed files with 37 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
debian/patches/0001-Move-em_utils_prompt_user-to-e-util-to-remove-duplic.patch vendored
View File

@ -17,8 +17,8 @@ Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=793209
modules/mail/e-mail-shell-view-actions.c | 3 +- modules/mail/e-mail-shell-view-actions.c | 3 +-
9 files changed, 99 insertions(+), 139 deletions(-) 9 files changed, 99 insertions(+), 139 deletions(-)
diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c Index: b/composer/e-composer-actions.c
index 4a072e3..e7c5524 100644 ===================================================================
--- a/composer/e-composer-actions.c --- a/composer/e-composer-actions.c
+++ b/composer/e-composer-actions.c +++ b/composer/e-composer-actions.c
@@ -27,59 +27,6 @@ @@ -27,59 +27,6 @@
@ -81,7 +81,7 @@ index 4a072e3..e7c5524 100644
static void static void
action_attach_cb (GtkAction *action, action_attach_cb (GtkAction *action,
EMsgComposer *composer) EMsgComposer *composer)
@@ -366,8 +313,8 @@ composer_actions_accel_activate_cb (GtkAccelGroup *accel_group, @@ -366,8 +313,8 @@
EMsgComposer *composer = user_data; EMsgComposer *composer = user_data;
if (keyval == GDK_KEY_Return && (modifier & GDK_MODIFIER_MASK) == GDK_CONTROL_MASK && if (keyval == GDK_KEY_Return && (modifier & GDK_MODIFIER_MASK) == GDK_CONTROL_MASK &&
@ -92,8 +92,8 @@ index 4a072e3..e7c5524 100644
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
diff --git a/e-util/e-misc-utils.c b/e-util/e-misc-utils.c Index: b/e-util/e-misc-utils.c
index da035de..b488394 100644 ===================================================================
--- a/e-util/e-misc-utils.c --- a/e-util/e-misc-utils.c
+++ b/e-util/e-misc-utils.c +++ b/e-util/e-misc-utils.c
@@ -49,6 +49,7 @@ @@ -49,6 +49,7 @@
@ -104,9 +104,9 @@ index da035de..b488394 100644
#include "e-alert-sink.h" #include "e-alert-sink.h"
#include "e-client-cache.h" #include "e-client-cache.h"
#include "e-filter-option.h" #include "e-filter-option.h"
@@ -3075,3 +3076,70 @@ e_util_cleanup_settings (void) @@ -3150,3 +3151,70 @@
g_mutex_unlock (&settings_hash_lock); g_mutex_unlock (&thread_pool_mutex);
} }
+ +
+/** +/**
@ -175,11 +175,11 @@ index da035de..b488394 100644
+ +
+ return button == GTK_RESPONSE_YES; + return button == GTK_RESPONSE_YES;
+} +}
diff --git a/e-util/e-misc-utils.h b/e-util/e-misc-utils.h Index: b/e-util/e-misc-utils.h
index 1d9d016..78146ce 100644 ===================================================================
--- a/e-util/e-misc-utils.h --- a/e-util/e-misc-utils.h
+++ b/e-util/e-misc-utils.h +++ b/e-util/e-misc-utils.h
@@ -272,6 +272,11 @@ void e_signal_disconnect_notify_handler @@ -272,6 +272,11 @@
GSettings * e_util_ref_settings (const gchar *schema_id); GSettings * e_util_ref_settings (const gchar *schema_id);
void e_util_cleanup_settings (void); void e_util_cleanup_settings (void);
@ -189,13 +189,13 @@ index 1d9d016..78146ce 100644
+ const gchar *tag, + const gchar *tag,
+ ...); + ...);
G_END_DECLS void e_util_run_simple_async_result_in_thread
(GSimpleAsyncResult *simple,
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c Index: b/mail/e-mail-backend.c
index beb5eef..cfe28a6 100644 ===================================================================
--- a/mail/e-mail-backend.c --- a/mail/e-mail-backend.c
+++ b/mail/e-mail-backend.c +++ b/mail/e-mail-backend.c
@@ -211,8 +211,8 @@ mail_backend_prepare_for_offline_cb (EShell *shell, @@ -211,8 +211,8 @@
mail_backend_any_store_requires_downsync (account_store); mail_backend_any_store_requires_downsync (account_store);
if (ask_to_synchronize) { if (ask_to_synchronize) {
@ -206,11 +206,11 @@ index beb5eef..cfe28a6 100644
} }
if (!synchronize) { if (!synchronize) {
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c Index: b/mail/e-mail-reader-utils.c
index 42dcf4b..0df7af1 100644 ===================================================================
--- a/mail/e-mail-reader-utils.c --- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c +++ b/mail/e-mail-reader-utils.c
@@ -443,8 +443,8 @@ e_mail_reader_expunge_folder (EMailReader *reader, @@ -443,8 +443,8 @@
window = e_mail_reader_get_window (reader); window = e_mail_reader_get_window (reader);
display_name = camel_folder_get_display_name (folder); display_name = camel_folder_get_display_name (folder);
@ -221,7 +221,7 @@ index 42dcf4b..0df7af1 100644
"mail:ask-expunge", display_name, NULL); "mail:ask-expunge", display_name, NULL);
if (proceed) { if (proceed) {
@@ -1511,8 +1511,8 @@ mail_reader_remove_duplicates_cb (GObject *source_object, @@ -1514,8 +1514,8 @@
n_duplicates = g_hash_table_size (duplicates); n_duplicates = g_hash_table_size (duplicates);
if (n_duplicates == 0) { if (n_duplicates == 0) {
@ -232,7 +232,7 @@ index 42dcf4b..0df7af1 100644
"mail:info-no-remove-duplicates", "mail:info-no-remove-duplicates",
camel_folder_get_display_name (folder), NULL); camel_folder_get_display_name (folder), NULL);
} else { } else {
@@ -1530,8 +1530,8 @@ mail_reader_remove_duplicates_cb (GObject *source_object, @@ -1533,8 +1533,8 @@
camel_folder_get_display_name (folder), camel_folder_get_display_name (folder),
n_duplicates); n_duplicates);
@ -243,11 +243,11 @@ index 42dcf4b..0df7af1 100644
"mail:ask-remove-duplicates", "mail:ask-remove-duplicates",
confirmation, NULL); confirmation, NULL);
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c Index: b/mail/em-composer-utils.c
index 8e5212b..4874995 100644 ===================================================================
--- a/mail/em-composer-utils.c --- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c
@@ -129,9 +129,9 @@ ask_confirm_for_unwanted_html_mail (EMsgComposer *composer, @@ -129,9 +129,9 @@
} }
if (str->len) if (str->len)
@ -259,7 +259,7 @@ index 8e5212b..4874995 100644
"mail:ask-send-html", str->str, NULL); "mail:ask-send-html", str->str, NULL);
else else
res = TRUE; res = TRUE;
@@ -144,8 +144,9 @@ ask_confirm_for_unwanted_html_mail (EMsgComposer *composer, @@ -144,8 +144,9 @@
static gboolean static gboolean
ask_confirm_for_empty_subject (EMsgComposer *composer) ask_confirm_for_empty_subject (EMsgComposer *composer)
{ {
@ -270,7 +270,7 @@ index 8e5212b..4874995 100644
"prompt-on-empty-subject", "prompt-on-empty-subject",
"mail:ask-send-no-subject", NULL); "mail:ask-send-no-subject", NULL);
} }
@@ -160,8 +161,9 @@ ask_confirm_for_only_bcc (EMsgComposer *composer, @@ -160,8 +161,9 @@
* this dialog to provide slightly different text in that case, to * this dialog to provide slightly different text in that case, to
* better explain what the hell is going on. */ * better explain what the hell is going on. */
@ -281,7 +281,7 @@ index 8e5212b..4874995 100644
"prompt-on-only-bcc", "prompt-on-only-bcc",
hidden_list_case ? hidden_list_case ?
"mail:ask-send-only-bcc-contact" : "mail:ask-send-only-bcc-contact" :
@@ -306,8 +308,9 @@ composer_presend_check_recipients (EMsgComposer *composer, @@ -306,8 +308,9 @@
} }
if (invalid_addrs) { if (invalid_addrs) {
@ -292,7 +292,7 @@ index 8e5212b..4874995 100644
"prompt-on-invalid-recip", "prompt-on-invalid-recip",
strstr (invalid_addrs->str, ", ") ? strstr (invalid_addrs->str, ", ") ?
"mail:ask-send-invalid-recip-multi" : "mail:ask-send-invalid-recip-multi" :
@@ -381,7 +384,8 @@ composer_presend_check_downloads (EMsgComposer *composer, @@ -381,7 +384,8 @@
store = e_attachment_view_get_store (view); store = e_attachment_view_get_store (view);
if (e_attachment_store_get_num_loading (store) > 0) { if (e_attachment_store_get_num_loading (store) > 0) {
@ -302,11 +302,11 @@ index 8e5212b..4874995 100644
"mail-composer:ask-send-message-pending-download", NULL)) "mail-composer:ask-send-message-pending-download", NULL))
check_passed = FALSE; check_passed = FALSE;
} }
diff --git a/mail/em-utils.c b/mail/em-utils.c Index: b/mail/em-utils.c
index b152359..88b845b 100644 ===================================================================
--- a/mail/em-utils.c --- a/mail/em-utils.c
+++ b/mail/em-utils.c +++ b/mail/em-utils.c
@@ -75,79 +75,14 @@ em_utils_ask_open_many (GtkWindow *parent, @@ -75,79 +75,14 @@
"Are you sure you want to open %d message at once?", "Are you sure you want to open %d message at once?",
"Are you sure you want to open %d messages at once?", "Are you sure you want to open %d messages at once?",
how_many), how_many); how_many), how_many);
@ -388,7 +388,7 @@ index b152359..88b845b 100644
/* Editing Filters/Search Folders... */ /* Editing Filters/Search Folders... */
static GtkWidget *filter_editor = NULL; static GtkWidget *filter_editor = NULL;
@@ -1332,7 +1267,8 @@ em_utils_empty_trash (GtkWidget *parent, @@ -1332,7 +1267,8 @@
registry = e_mail_session_get_registry (session); registry = e_mail_session_get_registry (session);
@ -398,11 +398,11 @@ index b152359..88b845b 100644
"prompt-on-empty-trash", "prompt-on-empty-trash",
"mail:ask-empty-trash", NULL)) "mail:ask-empty-trash", NULL))
return; return;
diff --git a/mail/em-utils.h b/mail/em-utils.h Index: b/mail/em-utils.h
index ccd4f71..8911cd7 100644 ===================================================================
--- a/mail/em-utils.h --- a/mail/em-utils.h
+++ b/mail/em-utils.h +++ b/mail/em-utils.h
@@ -36,7 +36,6 @@ G_BEGIN_DECLS @@ -36,7 +36,6 @@
struct _EMailPartList; struct _EMailPartList;
gboolean em_utils_ask_open_many (GtkWindow *parent, gint how_many); gboolean em_utils_ask_open_many (GtkWindow *parent, gint how_many);
@ -410,11 +410,11 @@ index ccd4f71..8911cd7 100644
void em_utils_edit_filters (EMailSession *session, void em_utils_edit_filters (EMailSession *session,
EAlertSink *alert_sink, EAlertSink *alert_sink,
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c Index: b/modules/mail/e-mail-shell-view-actions.c
index 5852101..6c6540d 100644 ===================================================================
--- a/modules/mail/e-mail-shell-view-actions.c --- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c +++ b/modules/mail/e-mail-shell-view-actions.c
@@ -588,7 +588,8 @@ mark_all_read_prompt_user (EMailShellView *mail_shell_view, @@ -588,7 +588,8 @@
default: default:
break; break;
} }
@ -424,6 +424,3 @@ index 5852101..6c6540d 100644
"prompt-on-mark-all-read", "prompt-on-mark-all-read",
"mail:ask-mark-all-read", NULL)) "mail:ask-mark-all-read", NULL))
return MARK_ALL_READ_CURRENT_ONLY; return MARK_ALL_READ_CURRENT_ONLY;
--
2.5.0