rpms/evolution/devel evolution-2.10.1-fix-uri-handling.patch, 1.1, 1.2 evolution.spec, 1.258, 1.259
Matthew Barnes (mbarnes)
fedora-extras-commits at redhat.com
Mon May 14 18:57:57 UTC 2007
- Previous message (by thread): rpms/aircrack-ng/devel .cvsignore, 1.6, 1.7 aircrack-ng.spec, 1.6, 1.7 sources, 1.6, 1.7
- Next message (by thread): comps comps-f7.xml.in,1.195,1.196 comps-fe6.xml.in,1.344,1.345
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mbarnes
Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32002
Modified Files:
evolution-2.10.1-fix-uri-handling.patch evolution.spec
Log Message:
* Mon May 14 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-15.fc7
- Revise patch for RH bug #236860 to match upstream's solution.
evolution-2.10.1-fix-uri-handling.patch:
Index: evolution-2.10.1-fix-uri-handling.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-2.10.1-fix-uri-handling.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-2.10.1-fix-uri-handling.patch 23 Apr 2007 00:58:36 -0000 1.1
+++ evolution-2.10.1-fix-uri-handling.patch 14 May 2007 18:57:22 -0000 1.2
@@ -1,45 +1,14 @@
---- evolution-2.10.1/shell/e-shell.c.fix-uri-handling 2007-04-22 20:19:39.000000000 -0400
-+++ evolution-2.10.1/shell/e-shell.c 2007-04-22 20:20:25.000000000 -0400
-@@ -257,8 +257,8 @@
- {
- EShell *shell = E_SHELL (bonobo_object_from_servant (servant));
- EComponentInfo *component_info;
-+ GtkWidget *shell_window;
- char *schema, *p;
-- int show = FALSE;
+--- evolution-2.10.1/calendar/gui/GNOME_Evolution_Calendar.server.in.in.fix-uri-handling 2007-04-09 09:10:33.000000000 -0400
++++ evolution-2.10.1/calendar/gui/GNOME_Evolution_Calendar.server.in.in 2007-05-14 14:11:59.000000000 -0400
+@@ -50,9 +50,11 @@
+ <oaf_attribute name="evolution:button_icon" type="string" value="stock_calendar"/>
+ <oaf_attribute name="evolution:button_sort_order" type="string" value="-8"/>
- schema = g_alloca(strlen(uri)+1);
- strcpy(schema, uri);
-@@ -267,26 +267,20 @@
- *p = 0;
++<!-- FIXME: See bug 407104: Write a interface to launch without shell.
+ <oaf_attribute name="evolution:uri_schemas" type="stringv">
+ <item value="calendar"/>
+ </oaf_attribute>
++-->
- component_info = e_component_registry_peek_info(shell->priv->component_registry, ECR_FIELD_SCHEMA, schema);
-- if (component_info == NULL) {
-- show = TRUE;
-+ if (component_info == NULL)
- component_info = e_component_registry_peek_info(shell->priv->component_registry, ECR_FIELD_ALIAS, schema);
-- }
+ </oaf_server>
- if (component_info == NULL) {
- CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Shell_UnsupportedSchema, NULL);
- return;
- }
-
-- if (show) {
-- GtkWidget *shell_window;
--
-- shell_window = (GtkWidget *)e_shell_create_window (shell, component_info->id, NULL);
-- if (shell_window == NULL) {
-- CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Shell_ComponentNotFound, NULL);
-- return;
-- }
-+ shell_window = (GtkWidget *)e_shell_create_window (shell, component_info->id, NULL);
-+ if (shell_window == NULL) {
-+ CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Shell_ComponentNotFound, NULL);
-+ return;
- }
--
-+
- GNOME_Evolution_Component_handleURI (component_info->iface, uri, ev);
- /* not an error not to implement it */
- if (ev->_id != NULL && strcmp(ev->_id, ex_CORBA_NO_IMPLEMENT) == 0)
Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- evolution.spec 14 May 2007 17:36:11 -0000 1.258
+++ evolution.spec 14 May 2007 18:57:22 -0000 1.259
@@ -47,7 +47,7 @@
Name: evolution
Version: 2.10.1
-Release: 14%{?dist}
+Release: 15%{?dist}
License: GPL
Group: Applications/Productivity
Summary: GNOME's next-generation groupware suite
@@ -755,6 +755,9 @@
%{_libdir}/evolution/%{evo_major}/libmenus.so
%changelog
+* Mon May 14 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-15.fc7
+- Revise patch for RH bug #236860 to match upstream's solution.
+
* Mon May 14 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-14.fc7
- Revise patch for RH bug #238155 (crash on startup).
- Previous message (by thread): rpms/aircrack-ng/devel .cvsignore, 1.6, 1.7 aircrack-ng.spec, 1.6, 1.7 sources, 1.6, 1.7
- Next message (by thread): comps comps-f7.xml.in,1.195,1.196 comps-fe6.xml.in,1.344,1.345
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list