rpms/evolution
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Add patch for RH bug #253348 (crash on startup).

Browse Source
This commit is contained in:
Matthew Barnes 2007-08-18 07:29:43 +00:00
parent b4dc82c07a
commit d72a1441ed
2 changed files with 56 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
evolution-2.11.90-enable-folder-tree.patch Normal file
View File

@ -0,0 +1,48 @@
--- evolution-2.11.90/mail/mail-component.c.enable-folder-tree 2007-08-18 02:21:45.000000000 -0400
+++ evolution-2.11.90/mail/mail-component.c 2007-08-18 02:23:54.000000000 -0400
@@ -652,30 +652,33 @@ enable_folder_tree (GtkWidget *emfb, Gtk
{
char *uri;
CamelURL *selected_curl, *current_curl;
- CamelFolder *folder;
- CamelException ex;
EMFolderView *emfv = (EMFolderView *)emfb;
/* Currently displayed folder */
- MessageList *ml = emfv->list;
- folder = ml->folder;
- uri = mail_tools_folder_to_url (folder);
- current_curl = camel_url_new (uri, NULL);
+ uri = mail_tools_folder_to_url (emfv->list->folder);
+ current_curl = uri ? camel_url_new (uri, NULL) : NULL;
+ g_free (uri);
- /* Selected folder in emft*/
+ /* Selected folder in emft */
uri = em_folder_tree_get_selected_uri ((EMFolderTree *) emft);
- folder = mail_tool_uri_to_folder (uri, 0, &ex);
- selected_curl = camel_url_new (uri, NULL);
+ selected_curl = uri ? camel_url_new (uri, NULL) : NULL;
- if (!camel_url_equal (selected_curl, current_curl))
- g_signal_emit_by_name (emft, "folder-selected", emft, uri, folder->full_name, uri, folder->folder_flags);
+ if (current_curl && selected_curl && !camel_url_equal (selected_curl, current_curl)) {
+ CamelFolder *folder;
+ CamelException ex;
+
+ camel_exception_init (&ex);
+ folder = mail_tool_uri_to_folder (uri, 0, &ex);
+ g_signal_emit_by_name (
+ emft, "folder-selected", emft, uri,
+ folder->full_name, uri, folder->folder_flags);
+ }
gtk_widget_set_sensitive (emft, TRUE);
camel_url_free (current_curl);
camel_url_free (selected_curl);
g_free (uri);
-
}
/* Evolution::Component CORBA methods. */

9
evolution.spec
View File

@ -45,7 +45,7 @@
Name: evolution Name: evolution
Version: 2.11.90 Version: 2.11.90
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2 and GFDL+ License: GPLv2 and GFDL+
Group: Applications/Productivity Group: Applications/Productivity
Summary: GNOME's next-generation groupware suite Summary: GNOME's next-generation groupware suite
@ -131,6 +131,9 @@ Patch33: evolution-2.10.0-e-passwords.patch
# GNOME bug #417999 # GNOME bug #417999
Patch34: evolution-2.10.0-e-source-combo-box.patch Patch34: evolution-2.10.0-e-source-combo-box.patch
# RH bug #253348 / GNOME bug #467883
Patch35: evolution-2.11.90-enable-folder-tree.patch
## Dependencies ### ## Dependencies ###
Requires(post): GConf2 Requires(post): GConf2
@ -269,6 +272,7 @@ Development files needed for building things which link against evolution.
%patch32 -p1 -b .view-message-source %patch32 -p1 -b .view-message-source
%patch33 -p1 -b .e-passwords %patch33 -p1 -b .e-passwords
%patch34 -p1 -b .e-source-combo-box %patch34 -p1 -b .e-source-combo-box
%patch35 -p1 -b .enable-folder-tree
mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib mkdir -p krb5-fakeprefix/lib
@ -711,6 +715,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/evolution/%{evo_major}/libmenus.so %{_libdir}/evolution/%{evo_major}/libmenus.so
%changelog %changelog
* Sat Aug 18 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.90-2.fc8
- Add patch for RH bug #253348 (crash on startup).
* Wed Aug 15 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.90-1.fc8 * Wed Aug 15 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.90-1.fc8
- Update to 2.11.90 - Update to 2.11.90