From 02f6231b7fb24112638b57228255ac9315a8b9d4 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: May 29 2007 04:09:29 +0000 Subject: - Update to 2.10.2 - Remove patch for RH bug #202289 (fixed upstream). - Remove patch for RH bug #235878 (fixed upstream). - Remove patch for RH bug #238551 (fixed upstream). --- diff --git a/.cvsignore b/.cvsignore index 8aa3781..42eccce 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.10.1.tar.bz2 +evolution-2.10.2.tar.bz2 diff --git a/evolution-2.10.1-e-attachment-bar.patch b/evolution-2.10.1-e-attachment-bar.patch deleted file mode 100644 index fdea03a..0000000 --- a/evolution-2.10.1-e-attachment-bar.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- evolution-2.10.1/widgets/misc/e-attachment-bar.c.e-attachment-bar 2007-05-01 11:22:41.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-attachment-bar.c 2007-05-01 15:10:49.000000000 -0400 -@@ -491,6 +491,8 @@ - g_ptr_array_free (temp_arr, TRUE); - - update (bar); -+ -+ g_signal_emit (bar, signals[CHANGED], 0); - - id++; - diff --git a/evolution-2.10.1-fix-help.patch b/evolution-2.10.1-fix-help.patch deleted file mode 100644 index caf4565..0000000 --- a/evolution-2.10.1-fix-help.patch +++ /dev/null @@ -1,192 +0,0 @@ ---- evolution-2.10.1/widgets/misc/e-multi-config-dialog.c.fix-help 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-multi-config-dialog.c 2007-04-13 22:26:25.000000000 -0400 -@@ -192,13 +192,12 @@ - - switch (response_id) { - case GTK_RESPONSE_HELP: -- gnome_help_display_desktop (NULL, -- "evolution-" BASE_VERSION, -- "evolution-" BASE_VERSION ".xml", -- "config-prefs", -- &error); -- if (error != NULL) -+ gnome_help_display ( -+ "evolution.xml", "config-prefs", &error); -+ if (error != NULL) { - g_warning ("%s", error->message); -+ g_error_free (error); -+ } - break; - case GTK_RESPONSE_CLOSE: - default: ---- evolution-2.10.1/widgets/misc/e-send-options.c.fix-help 2007-04-13 22:25:21.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-send-options.c 2007-04-13 22:26:25.000000000 -0400 -@@ -588,34 +588,32 @@ - - static void e_send_options_cb (GtkDialog *dialog, gint state, gpointer func_data) - { -+ ESendOptionsDialogPrivate *priv; -+ ESendOptionsDialog *sod; -+ GError *error = NULL; - -- ESendOptionsDialogPrivate *priv; -- ESendOptionsDialog *sod; -- GError *error = NULL; -- -- sod = func_data; -- priv = sod->priv; -- -- switch (state) { -- case GTK_RESPONSE_OK: -- e_send_options_get_widgets_data (sod); -- case GTK_RESPONSE_CANCEL: -- gtk_widget_hide (priv->main); -- gtk_widget_destroy (priv->main); -- g_object_unref (priv->xml); -- break; -- case GTK_RESPONSE_HELP: -- gnome_help_display_desktop (NULL, -- "evolution-" BASE_VERSION, -- "evolution-" BASE_VERSION ".xml", -- priv->help_section, -- &error); -- if (error != NULL) -- g_warning ("%s", error->message); -- break; -- } -- g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state); -+ sod = func_data; -+ priv = sod->priv; -+ -+ switch (state) { -+ case GTK_RESPONSE_OK: -+ e_send_options_get_widgets_data (sod); -+ case GTK_RESPONSE_CANCEL: -+ gtk_widget_hide (priv->main); -+ gtk_widget_destroy (priv->main); -+ g_object_unref (priv->xml); -+ break; -+ case GTK_RESPONSE_HELP: -+ gnome_help_display ( -+ "evolution.xml", priv->help_section, &error); -+ if (error != NULL) { -+ g_warning ("%s", error->message); -+ g_error_free (error); -+ } -+ break; -+ } - -+ g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state); - } - - gboolean ---- evolution-2.10.1/plugins/exchange-operations/exchange-send-options.c.fix-help 2007-04-13 22:25:21.000000000 -0400 -+++ evolution-2.10.1/plugins/exchange-operations/exchange-send-options.c 2007-04-13 22:26:25.000000000 -0400 -@@ -191,21 +191,20 @@ - - switch (state) { - case GTK_RESPONSE_OK: -- exchange_send_options_get_widgets_data (sod); -+ exchange_send_options_get_widgets_data (sod); - case GTK_RESPONSE_CANCEL: -- gtk_widget_hide (priv->main); -- gtk_widget_destroy (priv->main); -- g_object_unref (priv->xml); -- break; -+ gtk_widget_hide (priv->main); -+ gtk_widget_destroy (priv->main); -+ g_object_unref (priv->xml); -+ break; - case GTK_RESPONSE_HELP: -- gnome_help_display_desktop (NULL, -- "evolution-" BASE_VERSION, -- "evolution-" BASE_VERSION ".xml", -- priv->help_section, -- &error); -- if (error != NULL) -- g_warning ("%s", error->message); -- break; -+ gnome_help_display ( -+ "evolution.xml", priv->help_section, &error); -+ if (error != NULL) { -+ g_warning ("%s", error->message); -+ g_error_free (error); -+ } -+ break; - } - g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state); - ---- evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor.c.fix-help 2007-04-13 22:25:21.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor.c 2007-04-13 22:26:02.000000000 -0400 -@@ -3235,13 +3235,12 @@ - { - GError *error = NULL; - -- gnome_help_display_desktop (NULL, -- "evolution-" BASE_VERSION, -- "evolution-" BASE_VERSION ".xml", -- "usage-contact-cards", -- &error); -- if (error != NULL) -+ gnome_help_display ( -+ "evolution.xml", "usage-contact-cards", &error); -+ if (error != NULL) { - g_warning ("%s", error->message); -+ g_error_free (error); -+ } - } - - static GList * ---- evolution-2.10.1/composer/e-msg-composer.c.fix-help 2007-04-13 22:25:21.000000000 -0400 -+++ evolution-2.10.1/composer/e-msg-composer.c 2007-04-13 22:26:25.000000000 -0400 -@@ -2886,13 +2886,12 @@ - GError *error = NULL; - EMsgComposerPrivate *p = composer->priv; - -- gnome_help_display_desktop (NULL, -- "evolution-" BASE_VERSION, -- "evolution-" BASE_VERSION ".xml", -- "usage-composer", -- &error); -- if (error != NULL) -+ gnome_help_display ( -+ "evolution.xml", "usage-composer", &error); -+ if (error != NULL) { - g_warning ("%s", error->message); -+ g_error_free (error); -+ } - } - - ---- evolution-2.10.1/shell/e-shell-window.c.fix-help 2007-04-13 22:25:21.000000000 -0400 -+++ evolution-2.10.1/shell/e-shell-window.c 2007-04-13 22:26:02.000000000 -0400 -@@ -1042,7 +1042,7 @@ - bonobo_ui_util_set_ui (priv->ui_component, - PREFIX, - xmlfile, -- "evolution-" BASE_VERSION, NULL); -+ "evolution", NULL); - g_free (xmlfile); - - e_shell_window_commands_setup (window); ---- evolution-2.10.1/calendar/gui/dialogs/comp-editor.c.fix-help 2007-04-13 22:25:21.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/comp-editor.c 2007-04-13 22:26:25.000000000 -0400 -@@ -1693,13 +1693,12 @@ - - priv = editor->priv; - -- gnome_help_display_desktop (NULL, -- "evolution-" BASE_VERSION, -- "evolution-" BASE_VERSION ".xml", -- priv->help_section, -- &error); -- if (error != NULL) -+ gnome_help_display ( -+ "evolution.xml", priv->help_section, &error); -+ if (error != NULL) { - g_warning ("%s", error->message); -+ g_error_free (error); -+ } - } - - diff --git a/evolution-2.10.1-saving-attachments.patch b/evolution-2.10.1-saving-attachments.patch index 1f591f5..d47764a 100644 --- a/evolution-2.10.1-saving-attachments.patch +++ b/evolution-2.10.1-saving-attachments.patch @@ -1,5 +1,5 @@ ---- evolution-2.10.1/mail/em-utils.c.saving-attachments 2007-04-14 14:25:40.000000000 -0400 -+++ evolution-2.10.1/mail/em-utils.c 2007-04-14 15:08:50.000000000 -0400 +--- evolution-2.10.2/mail/em-utils.c.saving-attachments 2007-05-28 23:24:04.000000000 -0400 ++++ evolution-2.10.2/mail/em-utils.c 2007-05-28 23:26:18.000000000 -0400 @@ -354,28 +354,23 @@ /* Saving messages... */ @@ -13,13 +13,13 @@ - - if (response == GTK_RESPONSE_OK) { - uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (filesel)); -+ const gchar *filename; - +- - if (!e_file_can_save((GtkWindow *)filesel, uri)) { - g_free(uri); - return; - } -- ++ const gchar *filename; + - e_file_update_save_path(gtk_file_chooser_get_current_folder_uri( - GTK_FILE_CHOOSER(filesel)), TRUE); - /* FIXME: popup error if it fails? */ @@ -42,28 +42,17 @@ } /** -@@ -387,83 +382,78 @@ +@@ -387,73 +382,78 @@ * Saves a mime part to disk (prompting the user for filename). **/ void -em_utils_save_part(GtkWidget *parent, const char *prompt, CamelMimePart *part) +em_utils_save_part (GtkWidget *parent, const char *prompt, CamelMimePart *part) - { -- const char *name; -- GtkWidget *filesel; ++ { + GtkWidget *file_chooser; + const gchar *filename; + gchar *uri = NULL; - -- name = camel_mime_part_get_filename(part); -- if (name == NULL) { -- if (CAMEL_IS_MIME_MESSAGE(part)) { -- name = camel_mime_message_get_subject((CamelMimeMessage *)part); -- if (name == NULL) -- name = _("message"); -- } else { -- name = _("attachment"); -- } ++ + filename = emu_save_get_filename_for_part (part); + + file_chooser = e_file_get_save_filesel ( @@ -78,12 +67,8 @@ + if (!e_file_can_save (GTK_WINDOW (file_chooser), uri)) { + g_warning ("Unable to save %s", uri); + goto exit; - } - -- filesel = e_file_get_save_filesel(parent, prompt, name, GTK_FILE_CHOOSER_ACTION_SAVE); -- camel_object_ref(part); -- g_signal_connect (filesel, "response", G_CALLBACK (emu_save_part_response), part); -- gtk_widget_show (filesel); ++ } ++ + e_file_update_save_path ( + gtk_file_chooser_get_current_folder_uri ( + GTK_FILE_CHOOSER (file_chooser)), TRUE); @@ -93,17 +78,45 @@ +exit: + gtk_widget_destroy (file_chooser); + g_free (uri); - } - --static void --emu_save_parts_response (GtkWidget *filesel, int response, GSList *parts) ++ } ++ +void +em_utils_save_parts (GtkWidget *parent, const gchar *prompt, GSList *parts) { +- const char *name; +- GtkWidget *filesel; ++ GtkWidget *file_chooser; ++ gchar *path_uri; ++ GSList *iter; + +- name = camel_mime_part_get_filename(part); +- if (name == NULL) { +- if (CAMEL_IS_MIME_MESSAGE(part)) { +- name = camel_mime_message_get_subject((CamelMimeMessage *)part); +- if (name == NULL) +- name = _("message"); +- } else { +- name = _("attachment"); +- } +- } ++ file_chooser = e_file_get_save_filesel ( ++ parent, prompt, NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER); + +- filesel = e_file_get_save_filesel(parent, prompt, name, GTK_FILE_CHOOSER_ACTION_SAVE); +- camel_object_ref(part); +- g_signal_connect (filesel, "response", G_CALLBACK (emu_save_part_response), part); +- gtk_widget_show (filesel); +-} ++ if (gtk_dialog_run (GTK_DIALOG (file_chooser)) != GTK_RESPONSE_OK) ++ goto exit; + +-static void +-emu_save_parts_response (GtkWidget *filesel, int response, GSList *parts) +-{ - GSList *selected; - char *uri = NULL; - if (response == GTK_RESPONSE_OK) { -- uri = gtk_file_chooser_get_current_folder_uri(GTK_FILE_CHOOSER (filesel)); +- uri = gtk_file_chooser_get_uri(GTK_FILE_CHOOSER (filesel)); - e_file_update_save_path(uri, FALSE); - - for ( selected = parts; selected != NULL; selected = selected->next) { @@ -132,30 +145,20 @@ - mail_save_part(part, file_path, NULL, NULL, FALSE); - else - g_warning ("Could not save %s. File already exists", file_path); -+ GtkWidget *file_chooser; -+ gchar *path_uri; -+ GSList *iter; -+ -+ file_chooser = e_file_get_save_filesel ( -+ parent, prompt, NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER); -+ -+ if (gtk_dialog_run (GTK_DIALOG (file_chooser)) != GTK_RESPONSE_OK) -+ goto exit; -+ + path_uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (file_chooser)); + + e_file_update_save_path (path_uri, FALSE); - -- g_free (file_path); -- g_free (safe_name); -- } ++ + for (iter = parts; iter != NULL; iter = iter->next) { + CamelMimePart *part = iter->data; + const gchar *filename; + gchar *uri; -+ + +- g_free (file_path); +- g_free (safe_name); +- } + filename = emu_save_get_filename_for_part (part); -+ + + uri = g_build_path ("/", path_uri, filename, NULL); + + /* XXX Would be nice to mention _why_ we can't save. */ @@ -163,31 +166,23 @@ + mail_save_part (part, uri, NULL, NULL, FALSE); + else + g_warning ("Unable to save %s", uri); - ++ g_free (uri); - } - - g_slist_free (parts); - gtk_widget_destroy((GtkWidget *)filesel); --} + } - --void --em_utils_save_parts (GtkWidget *parent, const char *prompt, GSList * parts) --{ -- GtkWidget *filesel; ++ + g_free (path_uri); - -- filesel = e_file_get_save_filesel (parent, prompt, NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER); -- g_signal_connect (filesel, "response", G_CALLBACK (emu_save_parts_response), parts); -- gtk_widget_show (filesel); ++ +exit: + gtk_widget_destroy (file_chooser); } - ---- evolution-2.10.1/mail/em-format-html-display.c.saving-attachments 2007-04-14 14:25:40.000000000 -0400 -+++ evolution-2.10.1/mail/em-format-html-display.c 2007-04-14 15:08:50.000000000 -0400 + void +--- evolution-2.10.2/mail/em-format-html-display.c.saving-attachments 2007-05-28 23:24:04.000000000 -0400 ++++ evolution-2.10.2/mail/em-format-html-display.c 2007-05-28 23:24:05.000000000 -0400 @@ -2099,12 +2099,24 @@ } diff --git a/evolution-2.7.92-fix-prgname.patch b/evolution-2.7.92-fix-prgname.patch deleted file mode 100644 index 98689f4..0000000 --- a/evolution-2.7.92-fix-prgname.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- evolution-2.7.92/shell/main.c.fix-prgname 2006-08-28 11:04:44.000000000 -0400 -+++ evolution-2.7.92/shell/main.c 2006-08-28 11:04:56.000000000 -0400 -@@ -516,7 +516,7 @@ - - g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE); - -- program = gnome_program_init (PACKAGE "-" BASE_VERSION, VERSION, LIBGNOMEUI_MODULE, argc, argv, -+ program = gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc, argv, - GNOME_PROGRAM_STANDARD_PROPERTIES, - GNOME_PARAM_GOPTION_CONTEXT, context, - GNOME_PARAM_HUMAN_READABLE_NAME, _("Evolution"), diff --git a/evolution.spec b/evolution.spec index 982738c..6af782c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -46,8 +46,8 @@ ### Abstract ### Name: evolution -Version: 2.10.1 -Release: 17%{?dist} +Version: 2.10.2 +Release: 1%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -101,9 +101,6 @@ Patch23: evolution-2.7.3-replicated-cjk-input.patch # RH bug #178295 / GNOME bug #348638 Patch24: evolution-2.7.4-deleting-preedit-buffer.patch -# RH bug #202289 -Patch25: evolution-2.7.92-fix-prgname.patch - # RH bug #161885 / GNOME bug #309166 Patch26: evolution-2.8.0-indic-cursor-movement.patch @@ -158,9 +155,6 @@ Patch46: evolution-2.10.0-use-glib-i18n.patch # GNOME bug #418971 Patch47: evolution-2.10.0-drop-old-glib-support.patch -# RH bug #235878 / GNOME bug #386503 -Patch48: evolution-2.10.1-fix-help.patch - # RH bug #234315 / GNOME bug #423766 Patch49: evolution-2.10.1-saving-attachments.patch @@ -170,9 +164,6 @@ Patch50: evolution-2.10.1-fix-uri-handling.patch # RH bug #236399 / GNOME bug #434019 Patch51: evolution-2.10.1-en_CA-attribution-format.patch -# RH bug #238551 / GNOME bug #434981 -Patch52: evolution-2.10.1-e-attachment-bar.patch - # RH bug #238155 / GNOME bug #427232 Patch53: evolution-2.10.1-check-uri-before-strcmp.patch @@ -312,7 +303,6 @@ Development files needed for building things which link against evolution. %patch22 -p1 -b .filter-datespec %patch23 -p1 -b .replicated-cjk-input %patch24 -p1 -b .deleting-preedit-buffer -%patch25 -p1 -b .fix-prgname %patch26 -p1 -b .indic-cursor-movement %patch29 -p1 -b .fix-indic-printing %patch31 -p1 -b .kill-ethread @@ -331,11 +321,9 @@ Development files needed for building things which link against evolution. %patch45 -p1 -b .shell-main-cleanups %patch46 -p1 -b .use-glib-i18n %patch47 -p1 -b .drop-old-glib-support -%patch48 -p1 -b .fix-help %patch49 -p1 -b .saving-attachments %patch50 -p1 -b .fix-uri-handling %patch51 -p1 -b .en_CA-attribution-format -%patch52 -p1 -b .e-attachment-bar %patch53 -p1 -b .check-uri-before-strcmp %patch54 -p1 -b .send-recv-dialog @@ -759,6 +747,12 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon May 28 2007 Matthew Barnes - 2.10.2-1.fc7 +- Update to 2.10.2 +- Remove patch for RH bug #202289 (fixed upstream). +- Remove patch for RH bug #235878 (fixed upstream). +- Remove patch for RH bug #238551 (fixed upstream). + * Wed May 16 2007 Matthew Barnes - 2.10.1-17.fc7 - Revise patch for GNOME bug #362638 to fix RH bug #237206 (certificate prompt causes crash, again). diff --git a/sources b/sources index 5f86cfa..838573d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -16051c6cbb617cb04665e402566e0976 evolution-2.10.1.tar.bz2 +4b495be7f5e146ce7b5807134586336e evolution-2.10.2.tar.bz2