rpms/evolution/devel evolution-2.8.0-search-on-folder-change.patch, NONE, 1.1 evolution-2.8.0-fix-missing-declarations.patch, 1.1, 1.2 evolution.spec, 1.189, 1.190
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Sep 13 16:16:46 UTC 2006
- Previous message (by thread): rpms/cups/FC-5 cups-wbuffer.patch,NONE,1.1 cups.spec,1.221,1.222
- Next message (by thread): rpms/gfs2-utils/devel .cvsignore, 1.8, 1.9 gfs2-utils.spec, 1.16, 1.17 sources, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mbarnes
Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22796
Modified Files:
evolution-2.8.0-fix-missing-declarations.patch evolution.spec
Added Files:
evolution-2.8.0-search-on-folder-change.patch
Log Message:
* Wed Sep 13 2006 Matthew Barnes <mbarnes at redhat.com> - 2.8.0-2.fc6
- Add patch for RH bug #201307.
evolution-2.8.0-search-on-folder-change.patch:
em-folder-browser.c | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
--- NEW FILE evolution-2.8.0-search-on-folder-change.patch ---
--- evolution-2.8.0/mail/em-folder-browser.c.search-on-folder-change 2006-09-13 11:02:41.000000000 -0400
+++ evolution-2.8.0/mail/em-folder-browser.c 2006-09-13 11:03:04.000000000 -0400
@@ -1813,7 +1813,7 @@
before the folder is open and need to override the
defaults */
if (folder) {
- char *sstate;
+ char *sstate, *view_sexp, *search_word;
int state;
GConfClient *gconf = mail_config_get_gconf_client();
@@ -1855,9 +1855,16 @@
/* g_free(sstate); */
/* set the query manually, so we dont pop up advanced or saved search stuff */
- g_object_get(emfb->search, "query", &sstate, NULL);
- message_list_set_search(emfb->view.list, sstate);
- g_free(sstate);
+ g_object_get(emfb->search, "query", &search_word, NULL);
+ view_sexp = get_view_query (emfb->search);
+
+ if (search_word && *search_word)
+ search_word = g_strconcat ("(and ", view_sexp, search_word, " )", NULL);
+ else
+ search_word = g_strdup (view_sexp);
+
+ message_list_set_search(emfb->view.list, search_word);
+ g_free(search_word);
if ((sstate = camel_object_meta_get (folder, "evolution:selected_uid"))) {
emfb->priv->select_uid = sstate;
evolution-2.8.0-fix-missing-declarations.patch:
a11y/calendar/ea-gnome-calendar.c | 1 +
addressbook/gui/widgets/e-minicard.c | 1 +
calendar/gui/cal-search-bar.c | 1 +
calendar/gui/dialogs/memo-page.h | 2 ++
calendar/gui/e-cal-model-tasks.h | 1 +
calendar/gui/e-calendar-view.h | 12 ++++++++++++
calendar/gui/gnome-cal.h | 2 ++
composer/e-msg-composer.c | 1 +
mail/em-folder-view.c | 2 ++
mail/em-format-html-display.c | 1 +
shell/e-shell-window.c | 7 +++++++
widgets/misc/e-attachment-bar.h | 1 +
12 files changed, 32 insertions(+)
Index: evolution-2.8.0-fix-missing-declarations.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.8.0-fix-missing-declarations.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-2.8.0-fix-missing-declarations.patch 5 Sep 2006 11:48:57 -0000 1.1
+++ evolution-2.8.0-fix-missing-declarations.patch 13 Sep 2006 16:16:43 -0000 1.2
@@ -1,5 +1,5 @@
--- evolution-2.8.0/mail/em-folder-view.c.fix-missing-declarations 2006-09-02 02:43:04.000000000 -0400
-+++ evolution-2.8.0/mail/em-folder-view.c 2006-09-05 06:48:18.000000000 -0400
++++ evolution-2.8.0/mail/em-folder-view.c 2006-09-06 16:15:20.000000000 -0400
@@ -69,6 +69,8 @@
#include <gtkhtml/gtkhtml.h>
#include <gtkhtml/gtkhtml-stream.h>
@@ -10,45 +10,17 @@
#include "menus/gal-view-factory-etable.h"
#include "menus/gal-view-instance.h"
--- evolution-2.8.0/mail/em-format-html-display.c.fix-missing-declarations 2006-09-02 02:43:04.000000000 -0400
-+++ evolution-2.8.0/mail/em-format-html-display.c 2006-09-05 06:48:18.000000000 -0400
-@@ -29,6 +29,7 @@
- #include <glib.h>
- #include <glib/gstdio.h>
- #include <gdk/gdkkeysyms.h>
-+#include <gtk/gtk.h>
-
- #ifdef G_OS_WIN32
- /* Work around 'DATADIR' and 'interface' lossage in <windows.h> */
-@@ -42,27 +43,6 @@
- #include <gtkhtml/gtkhtml-embedded.h>
- #include <gtkhtml/gtkhtml-search.h>
-
--#include <gtk/gtkeventbox.h>
--#include <gtk/gtkvbox.h>
--#include <gtk/gtkhbox.h>
--#include <gtk/gtkbutton.h>
--#include <gtk/gtkstock.h>
--#include <gtk/gtkimage.h>
--#include <gtk/gtkarrow.h>
--#include <gtk/gtklabel.h>
--#include <gtk/gtkentry.h>
--#include <gtk/gtkscrolledwindow.h>
--#include <gtk/gtktextview.h>
--#include <gtk/gtktogglebutton.h>
--#include <gtk/gtktable.h>
--#include <gtk/gtkmenu.h>
--#include <gtk/gtkmenuitem.h>
--#include <gtk/gtkmain.h>
--#include <gtk/gtkdnd.h>
--#include <gtk/gtktoolbutton.h>
--#include <gtk/gtkframe.h>
--#include <gtk/gtkcheckbutton.h>
--
++++ evolution-2.8.0/mail/em-format-html-display.c 2006-09-06 16:15:20.000000000 -0400
+@@ -62,6 +62,7 @@
+ #include <gtk/gtktoolbutton.h>
+ #include <gtk/gtkframe.h>
+ #include <gtk/gtkcheckbutton.h>
++#include <gtk/gtksignal.h>
+
#include <glade/glade.h>
- #include <libgnomevfs/gnome-vfs-mime-handlers.h>
--- evolution-2.8.0/a11y/calendar/ea-gnome-calendar.c.fix-missing-declarations 2004-10-29 05:56:35.000000000 -0400
-+++ evolution-2.8.0/a11y/calendar/ea-gnome-calendar.c 2006-09-05 06:47:11.000000000 -0400
++++ evolution-2.8.0/a11y/calendar/ea-gnome-calendar.c 2006-09-06 16:15:20.000000000 -0400
@@ -28,6 +28,7 @@
#include <string.h>
#include <gtk/gtknotebook.h>
@@ -58,7 +30,7 @@
static void ea_gnome_calendar_class_init (EaGnomeCalendarClass *klass);
--- evolution-2.8.0/widgets/misc/e-attachment-bar.h.fix-missing-declarations 2006-05-31 23:30:06.000000000 -0400
-+++ evolution-2.8.0/widgets/misc/e-attachment-bar.h 2006-09-05 06:48:18.000000000 -0400
++++ evolution-2.8.0/widgets/misc/e-attachment-bar.h 2006-09-06 16:15:20.000000000 -0400
@@ -82,6 +82,7 @@
GSList *e_attachment_bar_get_selected (EAttachmentBar *bar);
void e_attachment_bar_set_width(EAttachmentBar *bar, int bar_width);
@@ -67,27 +39,8 @@
#ifdef __cplusplus
}
---- evolution-2.8.0/e-util/e-util.h.fix-missing-declarations 2006-09-02 02:42:18.000000000 -0400
-+++ evolution-2.8.0/e-util/e-util.h 2006-09-05 06:47:11.000000000 -0400
-@@ -27,6 +27,7 @@
- #include <sys/types.h>
- #include <glib-object.h>
- #include <limits.h>
-+#include <cairo/cairo.h>
- #include <gconf/gconf-client.h>
- #include <cairo.h>
-
-@@ -217,6 +218,8 @@
- ...);
- cairo_font_options_t * get_font_options ();
-
-+cairo_font_options_t * get_font_options ();
-+
- #ifdef __cplusplus
- }
- #endif /* __cplusplus */
--- evolution-2.8.0/addressbook/gui/widgets/e-minicard.c.fix-missing-declarations 2006-07-22 07:14:49.000000000 -0400
-+++ evolution-2.8.0/addressbook/gui/widgets/e-minicard.c 2006-09-05 06:48:18.000000000 -0400
++++ evolution-2.8.0/addressbook/gui/widgets/e-minicard.c 2006-09-06 16:15:20.000000000 -0400
@@ -39,6 +39,7 @@
#include "e-minicard-label.h"
#include "e-minicard-view.h"
@@ -96,18 +49,18 @@
#include <e-util/e-icon-factory.h>
#include <libebook/e-destination.h>
#include "a11y/addressbook/ea-addressbook.h"
---- evolution-2.8.0/composer/e-msg-composer.c.fix-missing-declarations 2006-09-05 00:11:45.000000000 -0400
-+++ evolution-2.8.0/composer/e-msg-composer.c 2006-09-05 06:48:18.000000000 -0400
-@@ -61,6 +61,7 @@
- #include <gconf/gconf.h>
+--- evolution-2.8.0/composer/e-msg-composer.c.fix-missing-declarations 2006-09-06 16:12:46.000000000 -0400
++++ evolution-2.8.0/composer/e-msg-composer.c 2006-09-06 16:15:20.000000000 -0400
+@@ -62,6 +62,7 @@
#include <gconf/gconf-client.h>
-+#include <libgnome/libgnome.h>
#include <libgnome/gnome-exec.h>
++#include <libgnome/gnome-help.h>
#include <libgnome/gnome-i18n.h>
#include <libgnomeui/gnome-uidefs.h>
---- evolution-2.8.0/shell/e-shell-window.c.fix-missing-declarations 2006-09-05 00:11:45.000000000 -0400
-+++ evolution-2.8.0/shell/e-shell-window.c 2006-09-05 06:48:18.000000000 -0400
+ #include <libgnomeui/gnome-window-icon.h>
+--- evolution-2.8.0/shell/e-shell-window.c.fix-missing-declarations 2006-09-06 16:12:46.000000000 -0400
++++ evolution-2.8.0/shell/e-shell-window.c 2006-09-06 16:15:20.000000000 -0400
@@ -58,6 +58,13 @@
#include <string.h>
@@ -122,18 +75,8 @@
/* A view for each component. These are all created when EShellWindow is
instantiated, but with the widget pointers to NULL and the page number set
---- evolution-2.8.0/calendar/gui/alarm-notify/alarm-notify.c.fix-missing-declarations 2006-09-02 02:41:31.000000000 -0400
-+++ evolution-2.8.0/calendar/gui/alarm-notify/alarm-notify.c 2006-09-05 06:48:18.000000000 -0400
-@@ -25,6 +25,7 @@
-
- #include <string.h>
- #include <bonobo/bonobo-main.h>
-+#include <libedataserver/e-data-server-util.h>
- #include <libedataserver/e-url.h>
- #include <libedataserver/e-data-server-util.h>
- #include <libedataserverui/e-passwords.h>
--- evolution-2.8.0/calendar/gui/e-calendar-view.h.fix-missing-declarations 2006-08-07 00:47:42.000000000 -0400
-+++ evolution-2.8.0/calendar/gui/e-calendar-view.h 2006-09-05 06:48:18.000000000 -0400
++++ evolution-2.8.0/calendar/gui/e-calendar-view.h 2006-09-06 16:15:20.000000000 -0400
@@ -166,6 +166,18 @@
gboolean new);
@@ -154,7 +97,7 @@
#endif
--- evolution-2.8.0/calendar/gui/gnome-cal.h.fix-missing-declarations 2006-07-22 07:14:51.000000000 -0400
-+++ evolution-2.8.0/calendar/gui/gnome-cal.h 2006-09-05 06:48:18.000000000 -0400
++++ evolution-2.8.0/calendar/gui/gnome-cal.h 2006-09-06 16:15:20.000000000 -0400
@@ -198,6 +198,8 @@
const char* comp_uid,
const char* comp_rid);
@@ -165,7 +108,7 @@
#endif
--- evolution-2.8.0/calendar/gui/dialogs/memo-page.h.fix-missing-declarations 2006-07-22 07:14:51.000000000 -0400
-+++ evolution-2.8.0/calendar/gui/dialogs/memo-page.h 2006-09-05 06:48:18.000000000 -0400
++++ evolution-2.8.0/calendar/gui/dialogs/memo-page.h 2006-09-06 16:15:20.000000000 -0400
@@ -53,6 +53,8 @@
GtkType memo_page_get_type (void);
MemoPage *memo_page_construct (MemoPage *epage);
@@ -176,7 +119,7 @@
G_END_DECLS
--- evolution-2.8.0/calendar/gui/cal-search-bar.c.fix-missing-declarations 2006-08-21 02:32:06.000000000 -0400
-+++ evolution-2.8.0/calendar/gui/cal-search-bar.c 2006-09-05 06:53:57.000000000 -0400
++++ evolution-2.8.0/calendar/gui/cal-search-bar.c 2006-09-06 16:15:20.000000000 -0400
@@ -31,6 +31,7 @@
#include <gtk/gtksignal.h>
#include <libgnome/gnome-i18n.h>
@@ -186,7 +129,7 @@
typedef struct CALSearchBarItem {
--- evolution-2.8.0/calendar/gui/e-cal-model-tasks.h.fix-missing-declarations 2005-10-03 02:16:51.000000000 -0400
-+++ evolution-2.8.0/calendar/gui/e-cal-model-tasks.h 2006-09-05 06:48:18.000000000 -0400
++++ evolution-2.8.0/calendar/gui/e-cal-model-tasks.h 2006-09-06 16:15:20.000000000 -0400
@@ -62,6 +62,7 @@
ECalModelTasks *e_cal_model_tasks_new (void);
Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- evolution.spec 5 Sep 2006 11:48:57 -0000 1.189
+++ evolution.spec 13 Sep 2006 16:16:43 -0000 1.190
@@ -45,7 +45,7 @@
Name: evolution
Version: 2.8.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPL
Group: Applications/Productivity
Summary: GNOME's next-generation groupware suite
@@ -118,6 +118,9 @@
# Gnome.org bug #351332
Patch30: evolution-2.8.0-fix-missing-declarations.patch
+# RH bug #201307 / Gnome.org bug #350565
+Patch31: evolution-2.8.0-search-on-folder-change.patch
+
### Dependencies ###
Requires: ORBit2 >= %{orbit2_version}
@@ -250,6 +253,7 @@
%patch28 -p1 -b .fix-prgname
%patch29 -p1 -b .chain-finalize
%patch30 -p1 -b .fix-missing-declarations
+%patch31 -p1 -b .search-on-folder-change
mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib
@@ -640,6 +644,9 @@
%{_libdir}/evolution/%{evo_major}/libmenus.so
%changelog
+* Wed Sep 13 2006 Matthew Barnes <mbarnes at redhat.com> - 2.8.0-2.fc6
+- Add patch for RH bug #201307.
+
* Mon Sep 4 2006 Matthew Barnes <mbarnes at redhat.com> - 2.8.0-1.fc6
- Update to 2.8.0
- Remove patch for RH bug #197868 (fixed upstream).
- Previous message (by thread): rpms/cups/FC-5 cups-wbuffer.patch,NONE,1.1 cups.spec,1.221,1.222
- Next message (by thread): rpms/gfs2-utils/devel .cvsignore, 1.8, 1.9 gfs2-utils.spec, 1.16, 1.17 sources, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list