pool/evolution
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 92839 from home:dimstar:GNOME:Next

Browse Source 
Update to 3.3.2

OBS-URL: https://build.opensuse.org/request/show/92839
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=149
This commit is contained in:
Dominique Leuenberger 2011-11-28 08:30:38 +00:00 committed by Git OBS Bridge
parent 6e63c457e6
commit c896039dfc
6 changed files with 116 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
evolution-3.2.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:dd2abaed96c36968dcc9c15d697a1f87db62a83268f48dfbae45076b7edf835d
size 16927181

3
evolution-3.3.2.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0115e1c04b20c3156b4db3e2956f58488168fdb0d27b18905c1ab9a511f29d91
size 16853744

142
evolution-GtkHVBox.patch
View File

@ -29,10 +29,10 @@ Subject: [PATCH] bgo#656143: Stop using deprecated Gtk[HV]Box(Class)?
widgets/table/e-table-field-chooser.h | 4 ++-- widgets/table/e-table-field-chooser.h | 4 ++--
23 files changed, 44 insertions(+), 44 deletions(-) 23 files changed, 44 insertions(+), 44 deletions(-)
Index: evolution-3.1.4/calendar/gui/e-timezone-entry.h Index: evolution-3.3.1.1/calendar/gui/e-timezone-entry.h
=================================================================== ===================================================================
--- evolution-3.1.4.orig/calendar/gui/e-timezone-entry.h --- evolution-3.3.1.1.orig/calendar/gui/e-timezone-entry.h
+++ evolution-3.1.4/calendar/gui/e-timezone-entry.h +++ evolution-3.3.1.1/calendar/gui/e-timezone-entry.h
@@ -61,12 +61,12 @@ typedef struct _ETimezoneEntryClass ETim @@ -61,12 +61,12 @@ typedef struct _ETimezoneEntryClass ETim
typedef struct _ETimezoneEntryPrivate ETimezoneEntryPrivate; typedef struct _ETimezoneEntryPrivate ETimezoneEntryPrivate;
@ -48,10 +48,10 @@ Index: evolution-3.1.4/calendar/gui/e-timezone-entry.h
void (*changed) (ETimezoneEntry *timezone_entry); void (*changed) (ETimezoneEntry *timezone_entry);
}; };
Index: evolution-3.1.4/capplet/settings/mail-account-view.h Index: evolution-3.3.1.1/capplet/settings/mail-account-view.h
=================================================================== ===================================================================
--- evolution-3.1.4.orig/capplet/settings/mail-account-view.h --- evolution-3.3.1.1.orig/capplet/settings/mail-account-view.h
+++ evolution-3.1.4/capplet/settings/mail-account-view.h +++ evolution-3.3.1.1/capplet/settings/mail-account-view.h
@@ -60,7 +60,7 @@ typedef struct _MAVPage { @@ -60,7 +60,7 @@ typedef struct _MAVPage {
}MAVPage; }MAVPage;
@ -70,10 +70,10 @@ Index: evolution-3.1.4/capplet/settings/mail-account-view.h
void (* view_close) (MailAccountView *); void (* view_close) (MailAccountView *);
Index: evolution-3.1.4/capplet/settings/mail-settings-view.h Index: evolution-3.3.1.1/capplet/settings/mail-settings-view.h
=================================================================== ===================================================================
--- evolution-3.1.4.orig/capplet/settings/mail-settings-view.h --- evolution-3.3.1.1.orig/capplet/settings/mail-settings-view.h
+++ evolution-3.1.4/capplet/settings/mail-settings-view.h +++ evolution-3.3.1.1/capplet/settings/mail-settings-view.h
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
typedef struct _MailSettingsViewPrivate MailSettingsViewPrivate; typedef struct _MailSettingsViewPrivate MailSettingsViewPrivate;
@ -92,10 +92,10 @@ Index: evolution-3.1.4/capplet/settings/mail-settings-view.h
void (* view_close) (MailSettingsView *); void (* view_close) (MailSettingsView *);
void (* show_account) (MailSettingsView *, gpointer); void (* show_account) (MailSettingsView *, gpointer);
Index: evolution-3.1.4/capplet/settings/mail-view.h Index: evolution-3.3.1.1/capplet/settings/mail-view.h
=================================================================== ===================================================================
--- evolution-3.1.4.orig/capplet/settings/mail-view.h --- evolution-3.3.1.1.orig/capplet/settings/mail-view.h
+++ evolution-3.1.4/capplet/settings/mail-view.h +++ evolution-3.3.1.1/capplet/settings/mail-view.h
@@ -69,7 +69,7 @@ typedef enum { @@ -69,7 +69,7 @@ typedef enum {
} MailViewFlags; } MailViewFlags;
@ -105,11 +105,11 @@ Index: evolution-3.1.4/capplet/settings/mail-view.h
gint type; gint type;
gchar *uri; gchar *uri;
MailViewFlags flags; MailViewFlags flags;
Index: evolution-3.1.4/e-util/e-config.c Index: evolution-3.3.1.1/e-util/e-config.c
=================================================================== ===================================================================
--- evolution-3.1.4.orig/e-util/e-config.c --- evolution-3.3.1.1.orig/e-util/e-config.c
+++ evolution-3.1.4/e-util/e-config.c +++ evolution-3.3.1.1/e-util/e-config.c
@@ -940,7 +940,7 @@ ec_rebuild (EConfig *emp) @@ -973,7 +973,7 @@ ec_rebuild (EConfig *emp)
/* ITEMs are called with the section parent. /* ITEMs are called with the section parent.
* The type depends on the section type, * The type depends on the section type,
@ -118,7 +118,7 @@ Index: evolution-3.1.4/e-util/e-config.c
w = NULL; w = NULL;
if (section == NULL) { if (section == NULL) {
wn->widget = NULL; wn->widget = NULL;
@@ -1347,7 +1347,7 @@ e_config_page_check (EConfig *config, co @@ -1362,7 +1362,7 @@ e_config_page_check (EConfig *config,
* Retrieve the page widget corresponding to @pageid. * Retrieve the page widget corresponding to @pageid.
* *
* Return value: The page widget. It will be the root GtkNotebook * Return value: The page widget. It will be the root GtkNotebook
@ -127,10 +127,10 @@ Index: evolution-3.1.4/e-util/e-config.c
**/ **/
GtkWidget * GtkWidget *
e_config_page_get (EConfig *ec, e_config_page_get (EConfig *ec,
Index: evolution-3.1.4/e-util/e-config.h Index: evolution-3.3.1.1/e-util/e-config.h
=================================================================== ===================================================================
--- evolution-3.1.4.orig/e-util/e-config.h --- evolution-3.3.1.1.orig/e-util/e-config.h
+++ evolution-3.1.4/e-util/e-config.h +++ evolution-3.3.1.1/e-util/e-config.h
@@ -122,9 +122,9 @@ enum _e_config_target_change_t { @@ -122,9 +122,9 @@ enum _e_config_target_change_t {
* @E_CONFIG_SECTION: A section in the configuration page. A page for * @E_CONFIG_SECTION: A section in the configuration page. A page for
* this section must have already been defined. The item @label if * this section must have already been defined. The item @label if
@ -143,10 +143,10 @@ Index: evolution-3.1.4/e-util/e-config.h
* @E_CONFIG_SECTION_TABLE: A table section. The same as an * @E_CONFIG_SECTION_TABLE: A table section. The same as an
* @E_CONFIG_SECTION but the content object is a GtkTable instead. * @E_CONFIG_SECTION but the content object is a GtkTable instead.
* @E_CONFIG_ITEM: A configuration item. It must have a parent * @E_CONFIG_ITEM: A configuration item. It must have a parent
Index: evolution-3.1.4/mail/e-mail-attachment-bar.h Index: evolution-3.3.1.1/mail/e-mail-attachment-bar.h
=================================================================== ===================================================================
--- evolution-3.1.4.orig/mail/e-mail-attachment-bar.h --- evolution-3.3.1.1.orig/mail/e-mail-attachment-bar.h
+++ evolution-3.1.4/mail/e-mail-attachment-bar.h +++ evolution-3.3.1.1/mail/e-mail-attachment-bar.h
@@ -51,12 +51,12 @@ typedef struct _EMailAttachmentBarClass @@ -51,12 +51,12 @@ typedef struct _EMailAttachmentBarClass
typedef struct _EMailAttachmentBarPrivate EMailAttachmentBarPrivate; typedef struct _EMailAttachmentBarPrivate EMailAttachmentBarPrivate;
@ -162,10 +162,10 @@ Index: evolution-3.1.4/mail/e-mail-attachment-bar.h
}; };
GType e_mail_attachment_bar_get_type (void); GType e_mail_attachment_bar_get_type (void);
Index: evolution-3.1.4/mail/e-mail-view.h Index: evolution-3.3.1.1/mail/e-mail-view.h
=================================================================== ===================================================================
--- evolution-3.1.4.orig/mail/e-mail-view.h --- evolution-3.3.1.1.orig/mail/e-mail-view.h
+++ evolution-3.1.4/mail/e-mail-view.h +++ evolution-3.3.1.1/mail/e-mail-view.h
@@ -53,12 +53,12 @@ typedef struct _EMailViewClass EMailView @@ -53,12 +53,12 @@ typedef struct _EMailViewClass EMailView
typedef struct _EMailViewPrivate EMailViewPrivate; typedef struct _EMailViewPrivate EMailViewPrivate;
@ -181,10 +181,10 @@ Index: evolution-3.1.4/mail/e-mail-view.h
/* Signals */ /* Signals */
void (*pane_close) (EMailView *view); void (*pane_close) (EMailView *view);
Index: evolution-3.1.4/modules/calendar/e-calendar-preferences.h Index: evolution-3.3.1.1/modules/calendar/e-calendar-preferences.h
=================================================================== ===================================================================
--- evolution-3.1.4.orig/modules/calendar/e-calendar-preferences.h --- evolution-3.3.1.1.orig/modules/calendar/e-calendar-preferences.h
+++ evolution-3.1.4/modules/calendar/e-calendar-preferences.h +++ evolution-3.3.1.1/modules/calendar/e-calendar-preferences.h
@@ -54,7 +54,7 @@ typedef struct _ECalendarPreferences ECa @@ -54,7 +54,7 @@ typedef struct _ECalendarPreferences ECa
typedef struct _ECalendarPreferencesClass ECalendarPreferencesClass; typedef struct _ECalendarPreferencesClass ECalendarPreferencesClass;
@ -203,10 +203,10 @@ Index: evolution-3.1.4/modules/calendar/e-calendar-preferences.h
}; };
GType e_calendar_preferences_get_type (void); GType e_calendar_preferences_get_type (void);
Index: evolution-3.1.4/modules/mail/em-composer-prefs.h Index: evolution-3.3.1.1/modules/mail/em-composer-prefs.h
=================================================================== ===================================================================
--- evolution-3.1.4.orig/modules/mail/em-composer-prefs.h --- evolution-3.3.1.1.orig/modules/mail/em-composer-prefs.h
+++ evolution-3.1.4/modules/mail/em-composer-prefs.h +++ evolution-3.3.1.1/modules/mail/em-composer-prefs.h
@@ -56,7 +56,7 @@ typedef struct _EMComposerPrefsClass EMC @@ -56,7 +56,7 @@ typedef struct _EMComposerPrefsClass EMC
struct _ESignature; struct _ESignature;
@ -225,10 +225,10 @@ Index: evolution-3.1.4/modules/mail/em-composer-prefs.h
}; };
GType em_composer_prefs_get_type (void); GType em_composer_prefs_get_type (void);
Index: evolution-3.1.4/modules/mail/em-mailer-prefs.h Index: evolution-3.3.1.1/modules/mail/em-mailer-prefs.h
=================================================================== ===================================================================
--- evolution-3.1.4.orig/modules/mail/em-mailer-prefs.h --- evolution-3.3.1.1.orig/modules/mail/em-mailer-prefs.h
+++ evolution-3.1.4/modules/mail/em-mailer-prefs.h +++ evolution-3.3.1.1/modules/mail/em-mailer-prefs.h
@@ -53,7 +53,7 @@ typedef struct _EMMailerPrefs EMMailerPr @@ -53,7 +53,7 @@ typedef struct _EMMailerPrefs EMMailerPr
typedef struct _EMMailerPrefsClass EMMailerPrefsClass; typedef struct _EMMailerPrefsClass EMMailerPrefsClass;
@ -247,10 +247,10 @@ Index: evolution-3.1.4/modules/mail/em-mailer-prefs.h
}; };
GType em_mailer_prefs_get_type (void); GType em_mailer_prefs_get_type (void);
Index: evolution-3.1.4/modules/mail/em-network-prefs.h Index: evolution-3.3.1.1/modules/mail/em-network-prefs.h
=================================================================== ===================================================================
--- evolution-3.1.4.orig/modules/mail/em-network-prefs.h --- evolution-3.3.1.1.orig/modules/mail/em-network-prefs.h
+++ evolution-3.1.4/modules/mail/em-network-prefs.h +++ evolution-3.3.1.1/modules/mail/em-network-prefs.h
@@ -59,7 +59,7 @@ typedef enum { @@ -59,7 +59,7 @@ typedef enum {
} NetworkConfigProxyType; } NetworkConfigProxyType;
@ -260,7 +260,7 @@ Index: evolution-3.1.4/modules/mail/em-network-prefs.h
GConfClient *gconf; GConfClient *gconf;
@@ -91,7 +91,7 @@ struct _EMNetworkPrefs { @@ -94,7 +94,7 @@ struct _EMNetworkPrefs {
}; };
struct _EMNetworkPrefsClass { struct _EMNetworkPrefsClass {
@ -269,10 +269,10 @@ Index: evolution-3.1.4/modules/mail/em-network-prefs.h
}; };
GType em_network_prefs_get_type (void); GType em_network_prefs_get_type (void);
Index: evolution-3.1.4/plugins/itip-formatter/itip-view.h Index: evolution-3.3.1.1/plugins/itip-formatter/itip-view.h
=================================================================== ===================================================================
--- evolution-3.1.4.orig/plugins/itip-formatter/itip-view.h --- evolution-3.3.1.1.orig/plugins/itip-formatter/itip-view.h
+++ evolution-3.1.4/plugins/itip-formatter/itip-view.h +++ evolution-3.3.1.1/plugins/itip-formatter/itip-view.h
@@ -76,7 +76,7 @@ typedef enum { @@ -76,7 +76,7 @@ typedef enum {
} ItipViewInfoItemType; } ItipViewInfoItemType;
@ -291,10 +291,10 @@ Index: evolution-3.1.4/plugins/itip-formatter/itip-view.h
void (* source_selected) (ItipView *view, ESource *selected_source); void (* source_selected) (ItipView *view, ESource *selected_source);
void (* response) (ItipView *view, gint response); void (* response) (ItipView *view, gint response);
Index: evolution-3.1.4/shell/e-shell-taskbar.h Index: evolution-3.3.1.1/shell/e-shell-taskbar.h
=================================================================== ===================================================================
--- evolution-3.1.4.orig/shell/e-shell-taskbar.h --- evolution-3.3.1.1.orig/shell/e-shell-taskbar.h
+++ evolution-3.1.4/shell/e-shell-taskbar.h +++ evolution-3.3.1.1/shell/e-shell-taskbar.h
@@ -59,12 +59,12 @@ typedef struct _EShellTaskbarPrivate ESh @@ -59,12 +59,12 @@ typedef struct _EShellTaskbarPrivate ESh
* functions below. * functions below.
**/ **/
@ -310,10 +310,10 @@ Index: evolution-3.1.4/shell/e-shell-taskbar.h
}; };
GType e_shell_taskbar_get_type (void); GType e_shell_taskbar_get_type (void);
Index: evolution-3.1.4/widgets/misc/e-alert-bar.c Index: evolution-3.3.1.1/widgets/misc/e-alert-bar.c
=================================================================== ===================================================================
--- evolution-3.1.4.orig/widgets/misc/e-alert-bar.c --- evolution-3.3.1.1.orig/widgets/misc/e-alert-bar.c
+++ evolution-3.1.4/widgets/misc/e-alert-bar.c +++ evolution-3.3.1.1/widgets/misc/e-alert-bar.c
@@ -177,7 +177,7 @@ alert_bar_dispose (GObject *object) @@ -177,7 +177,7 @@ alert_bar_dispose (GObject *object)
static GtkSizeRequestMode static GtkSizeRequestMode
alert_bar_get_request_mode (GtkWidget *widget) alert_bar_get_request_mode (GtkWidget *widget)
@ -323,10 +323,10 @@ Index: evolution-3.1.4/widgets/misc/e-alert-bar.c
* want the alert bar to be as short as possible. */ * want the alert bar to be as short as possible. */
return GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH; return GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH;
} }
Index: evolution-3.1.4/widgets/misc/e-attachment-button.h Index: evolution-3.3.1.1/widgets/misc/e-attachment-button.h
=================================================================== ===================================================================
--- evolution-3.1.4.orig/widgets/misc/e-attachment-button.h --- evolution-3.3.1.1.orig/widgets/misc/e-attachment-button.h
+++ evolution-3.1.4/widgets/misc/e-attachment-button.h +++ evolution-3.3.1.1/widgets/misc/e-attachment-button.h
@@ -52,12 +52,12 @@ typedef struct _EAttachmentButtonClass E @@ -52,12 +52,12 @@ typedef struct _EAttachmentButtonClass E
typedef struct _EAttachmentButtonPrivate EAttachmentButtonPrivate; typedef struct _EAttachmentButtonPrivate EAttachmentButtonPrivate;
@ -342,10 +342,10 @@ Index: evolution-3.1.4/widgets/misc/e-attachment-button.h
}; };
GType e_attachment_button_get_type (void); GType e_attachment_button_get_type (void);
Index: evolution-3.1.4/widgets/misc/e-dateedit.h Index: evolution-3.3.1.1/widgets/misc/e-dateedit.h
=================================================================== ===================================================================
--- evolution-3.1.4.orig/widgets/misc/e-dateedit.h --- evolution-3.3.1.1.orig/widgets/misc/e-dateedit.h
+++ evolution-3.1.4/widgets/misc/e-dateedit.h +++ evolution-3.3.1.1/widgets/misc/e-dateedit.h
@@ -60,14 +60,14 @@ typedef struct tm (*EDateEditGetTimeCall @@ -60,14 +60,14 @@ typedef struct tm (*EDateEditGetTimeCall
gpointer data); gpointer data);
@ -363,10 +363,10 @@ Index: evolution-3.1.4/widgets/misc/e-dateedit.h
void (* changed) (EDateEdit *dedit); void (* changed) (EDateEdit *dedit);
}; };
Index: evolution-3.1.4/widgets/misc/e-image-chooser.h Index: evolution-3.3.1.1/widgets/misc/e-image-chooser.h
=================================================================== ===================================================================
--- evolution-3.1.4.orig/widgets/misc/e-image-chooser.h --- evolution-3.3.1.1.orig/widgets/misc/e-image-chooser.h
+++ evolution-3.1.4/widgets/misc/e-image-chooser.h +++ evolution-3.3.1.1/widgets/misc/e-image-chooser.h
@@ -50,12 +50,12 @@ typedef struct _EImageChooserClass EImag @@ -50,12 +50,12 @@ typedef struct _EImageChooserClass EImag
typedef struct _EImageChooserPrivate EImageChooserPrivate; typedef struct _EImageChooserPrivate EImageChooserPrivate;
@ -382,10 +382,10 @@ Index: evolution-3.1.4/widgets/misc/e-image-chooser.h
/* signals */ /* signals */
void (*changed) (EImageChooser *chooser); void (*changed) (EImageChooser *chooser);
Index: evolution-3.1.4/widgets/misc/e-preview-pane.h Index: evolution-3.3.1.1/widgets/misc/e-preview-pane.h
=================================================================== ===================================================================
--- evolution-3.1.4.orig/widgets/misc/e-preview-pane.h --- evolution-3.3.1.1.orig/widgets/misc/e-preview-pane.h
+++ evolution-3.1.4/widgets/misc/e-preview-pane.h +++ evolution-3.3.1.1/widgets/misc/e-preview-pane.h
@@ -52,12 +52,12 @@ typedef struct _EPreviewPaneClass EPrevi @@ -52,12 +52,12 @@ typedef struct _EPreviewPaneClass EPrevi
typedef struct _EPreviewPanePrivate EPreviewPanePrivate; typedef struct _EPreviewPanePrivate EPreviewPanePrivate;
@ -401,10 +401,10 @@ Index: evolution-3.1.4/widgets/misc/e-preview-pane.h
/* Signals */ /* Signals */
void (*show_search_bar) (EPreviewPane *preview_pane); void (*show_search_bar) (EPreviewPane *preview_pane);
Index: evolution-3.1.4/widgets/misc/e-search-bar.h Index: evolution-3.3.1.1/widgets/misc/e-search-bar.h
=================================================================== ===================================================================
--- evolution-3.1.4.orig/widgets/misc/e-search-bar.h --- evolution-3.3.1.1.orig/widgets/misc/e-search-bar.h
+++ evolution-3.1.4/widgets/misc/e-search-bar.h +++ evolution-3.3.1.1/widgets/misc/e-search-bar.h
@@ -52,12 +52,12 @@ typedef struct _ESearchBarClass ESearchB @@ -52,12 +52,12 @@ typedef struct _ESearchBarClass ESearchB
typedef struct _ESearchBarPrivate ESearchBarPrivate; typedef struct _ESearchBarPrivate ESearchBarPrivate;
@ -420,11 +420,11 @@ Index: evolution-3.1.4/widgets/misc/e-search-bar.h
/* Signals */ /* Signals */
void (*changed) (ESearchBar *search_bar); void (*changed) (ESearchBar *search_bar);
Index: evolution-3.1.4/widgets/misc/e-url-entry.h Index: evolution-3.3.1.1/widgets/misc/e-url-entry.h
=================================================================== ===================================================================
--- evolution-3.1.4.orig/widgets/misc/e-url-entry.h --- evolution-3.3.1.1.orig/widgets/misc/e-url-entry.h
+++ evolution-3.1.4/widgets/misc/e-url-entry.h +++ evolution-3.3.1.1/widgets/misc/e-url-entry.h
@@ -39,13 +39,13 @@ typedef struct _EUrlEntryPrivate EUrlEnt @@ -38,13 +38,13 @@ typedef struct _EUrlEntryPrivate EUrlEnt
typedef struct _EUrlEntryClass EUrlEntryClass; typedef struct _EUrlEntryClass EUrlEntryClass;
struct _EUrlEntry { struct _EUrlEntry {
@ -439,11 +439,11 @@ Index: evolution-3.1.4/widgets/misc/e-url-entry.h
+ GtkBoxClass parent_class; + GtkBoxClass parent_class;
}; };
GType e_url_entry_get_type (void);
Index: evolution-3.1.4/widgets/table/e-table-field-chooser.h Index: evolution-3.3.1.1/widgets/table/e-table-field-chooser.h
=================================================================== ===================================================================
--- evolution-3.1.4.orig/widgets/table/e-table-field-chooser.h --- evolution-3.3.1.1.orig/widgets/table/e-table-field-chooser.h
+++ evolution-3.1.4/widgets/table/e-table-field-chooser.h +++ evolution-3.3.1.1/widgets/table/e-table-field-chooser.h
@@ -53,7 +53,7 @@ typedef struct _ETableFieldChooser ETabl @@ -53,7 +53,7 @@ typedef struct _ETableFieldChooser ETabl
typedef struct _ETableFieldChooserClass ETableFieldChooserClass; typedef struct _ETableFieldChooserClass ETableFieldChooserClass;

127
evolution-text-colour.patch
View File

@ -1,127 +0,0 @@
From c8abdeddfb0bcad2f53dd75d618c462ad3b7ad28 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Fri, 21 Oct 2011 12:13:01 +0000
Subject: Bug #660738 - Font changes ignored since 3.2
---
diff --git a/e-util/e-util.c b/e-util/e-util.c
index 8ededee..136f8ec 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -1431,9 +1431,19 @@ e_binding_transform_color_to_string (GBinding *binding,
g_return_val_if_fail (G_IS_BINDING (binding), FALSE);
color = g_value_get_boxed (source_value);
- string = gdk_color_to_string (color);
- g_value_set_string (target_value, string);
- g_free (string);
+ if (!color) {
+ g_value_set_string (target_value, "");
+ } else {
+ /* encode color manually, because css styles expect colors in #rrggbb,
+ not in #rrrrggggbbbb, which is a result of gdk_color_to_string()
+ */
+ string = g_strdup_printf ("#%02x%02x%02x",
+ (gint) color->red * 256 / 65536,
+ (gint) color->green * 256 / 65536,
+ (gint) color->blue * 256 / 65536);
+ g_value_set_string (target_value, string);
+ g_free (string);
+ }
return TRUE;
}
diff --git a/modules/mail/e-mail-config-web-view.c b/modules/mail/e-mail-config-web-view.c
index b8a755b..d873a54 100644
--- a/modules/mail/e-mail-config-web-view.c
+++ b/modules/mail/e-mail-config-web-view.c
@@ -20,6 +20,9 @@
#include <config.h>
#endif
+#include <stdio.h>
+#include <string.h>
+
#include "e-mail-config-web-view.h"
#include <shell/e-shell.h>
@@ -41,6 +44,24 @@ struct _EMailConfigWebViewClass {
static gpointer parent_class;
+/* replaces content of color string */
+static void
+fix_color_string (gchar *color_string)
+{
+ GdkColor color;
+
+ if (!color_string || strlen (color_string) < 13)
+ return;
+
+ if (!gdk_color_parse (color_string, &color))
+ return;
+
+ sprintf (color_string, "#%02x%02x%02x",
+ (gint) color.red * 256 / 65536,
+ (gint) color.green * 256 / 65536,
+ (gint) color.blue * 256 / 65536);
+}
+
static void
mail_config_web_view_load_style (EMailConfigWebView *extension)
{
@@ -77,13 +98,16 @@ mail_config_web_view_load_style (EMailConfigWebView *extension)
buffer = g_string_new ("EWebView {\n");
+ fix_color_string (citation_color);
+ fix_color_string (spell_color);
+
if (custom_fonts && variable_font != NULL)
g_string_append_printf (
buffer, " font: %s;\n", variable_font);
if (custom_fonts && monospace_font != NULL)
g_string_append_printf (
- buffer, " -GtkHTML-fixed-font-name: %s;\n",
+ buffer, " -GtkHTML-fixed-font-name: '%s';\n",
monospace_font);
if (mark_citations && citation_color != NULL)
@@ -93,7 +117,7 @@ mail_config_web_view_load_style (EMailConfigWebView *extension)
if (spell_color != NULL)
g_string_append_printf (
- buffer, " -GtkHTML-spell-error-color: %s\n",
+ buffer, " -GtkHTML-spell-error-color: %s;\n",
spell_color);
g_string_append (buffer, "}\n");
@@ -112,6 +136,9 @@ mail_config_web_view_load_style (EMailConfigWebView *extension)
g_free (variable_font);
g_free (citation_color);
g_free (spell_color);
+
+ gtk_style_context_invalidate (
+ gtk_widget_get_style_context (GTK_WIDGET (e_extension_get_extensible (E_EXTENSION (extension)))));
}
static void
@@ -142,13 +169,13 @@ mail_config_web_view_realize (GtkWidget *widget,
widget, "magic-smileys",
G_BINDING_SYNC_CREATE);
- mail_config_web_view_load_style (extension);
-
gtk_style_context_add_provider (
gtk_widget_get_style_context (widget),
GTK_STYLE_PROVIDER (extension->css_provider),
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+ mail_config_web_view_load_style (extension);
+
/* Reload the style sheet when certain settings change. */
g_signal_connect_swapped (
--
cgit v0.9.0.2

38
evolution.changes
View File

@ -1,3 +1,41 @@
-------------------------------------------------------------------
Mon Nov 21 08:34:45 UTC 2011 - dimstar@opensuse.org
- Update to version 3.3.2:
+ Remove g_thread_init() calls.
+ Teach Evolution about Photo/Logo EContact fields stored as URIs
+ Add EAuthComboBox widget.
+ EMAccountEditor: Start using CamelNetworkSettings.
+ Call e_gdbus_templates_init_main_thread() in main()
+ Kill gtk-doc tmpl files.
+ Removing a redundant virtual function
+ Remove SQLite mail summary migration.
+ EMAccountEditor: Add a review page.
+ Preset 'width-chars' for account type description labels
+ Use CamelSExp instead of ESExp in filter, mail.
+ Bugs fixed: bgo#440316, bgo#565483, bgo#627952, bgo#636214,
bgo#659557, bgo#659736, bgo#659945, bgo#660782, bgo#660878,
bgo#661126, bgo#662589, bgo#662742, bgo#662914, bgo#662929,
bgo#663286, bgo#663372, bgo#663376, bgo#663746, bgo#663748,
bgo#663836, bgo#664001, bgo#664016
+ Updated translations.
-------------------------------------------------------------------
Thu Oct 27 21:55:45 UTC 2011 - dimstar@opensuse.org
- Update to version 3.3.1.1:
+ Work around libgthread shenanigans in GLib 2.31.
-------------------------------------------------------------------
Wed Oct 26 19:42:33 UTC 2011 - dimstar@opensuse.org
- Update to version 3.3.1:
+ Bugs fixed: bgo#660738, bgo#616981, bgo#451377, bgo#661409,
bgo#527616, bgo#661549.
+ Updated translations.
- Drop evolution-text-colour.patch: fixed upstream.
- Rebase evolution-GtkHVBox.patch.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 24 13:57:36 UTC 2011 - awafaa@opensuse.org Mon Oct 24 13:57:36 UTC 2011 - awafaa@opensuse.org

9
evolution.spec
View File

@ -71,12 +71,12 @@ BuildRequires: pkgconfig(shared-mime-info)
License: LGPLv2.0 ; LGPLv3 License: LGPLv2.0 ; LGPLv3
Group: Productivity/Networking/Email/Clients Group: Productivity/Networking/Email/Clients
# This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in. # This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in.
%define evolution_base_version 3.2 %define evolution_base_version 3.4
Version: 3.2.1 Version: 3.3.2
Release: 1 Release: 1
# FIXME: check with upstream/meego if we want to enable clutter for express mode # FIXME: check with upstream/meego if we want to enable clutter for express mode
Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite
Source0: http://download.gnome.org/sources/evolution/3.2/%{name}-%{version}.tar.bz2 Source0: http://download.gnome.org/sources/evolution/3.3/%{name}-%{version}.tar.bz2
# PATCH-FIX-OPENSUSE evolution-custom-openldap-includes.patch maw@novell.com -- look for ldap includes in %{_libdir}/evoldap/include # PATCH-FIX-OPENSUSE evolution-custom-openldap-includes.patch maw@novell.com -- look for ldap includes in %{_libdir}/evoldap/include
Patch15: evolution-custom-openldap-includes.patch Patch15: evolution-custom-openldap-includes.patch
# PATCH-FIX-UPSTREAM bnc-435722-book-uri-long.patch bnc#435722 abharath@suse.de -- Book URI: Spills Into Second Column. # PATCH-FIX-UPSTREAM bnc-435722-book-uri-long.patch bnc#435722 abharath@suse.de -- Book URI: Spills Into Second Column.
@ -85,8 +85,6 @@ Patch19: bnc-435722-book-uri-long.patch
Patch35: bnc-210959-evo-accept-ics.patch Patch35: bnc-210959-evo-accept-ics.patch
# PATCH-FIX-UPSTREAM evolution-GtkHVBox.patch bgo#656143 dimstar@opensuse.org -- Stop using deprecated Gtk[HV]Box(Class)?. # PATCH-FIX-UPSTREAM evolution-GtkHVBox.patch bgo#656143 dimstar@opensuse.org -- Stop using deprecated Gtk[HV]Box(Class)?.
Patch36: evolution-GtkHVBox.patch Patch36: evolution-GtkHVBox.patch
# PATCH-FIX-UPSTREAM evolution-text-colour.patch bgo#660738 awafaa@opensuse.org -- Fix broken text colour highlighting.
Patch37: evolution-text-colour.patch
Url: http://gnome.org/projects/evolution/ Url: http://gnome.org/projects/evolution/
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Recommends: %{name}-lang Recommends: %{name}-lang
@ -179,7 +177,6 @@ translation-update-upstream
%patch19 %patch19
%patch35 %patch35
%patch36 -p1 %patch36 -p1
%patch37 -p1
%build %build
autoreconf -f -i autoreconf -f -i