Hello community,
here is the log from the commit of package mail-notification for openSUSE:Factory
checked in at Mon Sep 13 18:36:00 CEST 2010.
--------
--- GNOME/mail-notification/mail-notification.changes 2010-08-24 19:32:13.000000000 +0200
+++ mail-notification/mail-notification.changes 2010-09-11 00:39:26.000000000 +0200
@@ -1,0 +2,26 @@
+Sat Sep 11 00:36:54 CEST 2010 - vuntz@opensuse.org
+
+- Pass gconf-schemas-dir=%{_sysconfdir}/gconf/schemas and
+ install-gconf-schemas=no to configure. This enables us to remove
+ the hacks for gconf in %install, where we were setting
+ GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 and moving the schemas
+ back to /etc.
+
+-------------------------------------------------------------------
+Fri Aug 27 16:29:39 UTC 2010 - fcrozat@novell.com
+
+- Update mail-notification-5.4-missing-icons.patch with Fedora
+ version
+- Add mail-notification-5.4-gob2-2.0.16.patch and
+ mail-notification-5.4-evo2.29-gob2.patch from Debian to fix
+ build with gob2 >= 2.0.16 (deb#580886)
+- Patch mail-notification-5.4-eds-2.32.patch to fix build with
+ evolution 2.31
+- Ensure cflags are used in the build and debuginfo is correct
+ (Fedora)
+- mail-notification-5.4-evolution-gtkhtml.patch : Fix build with
+ old gtkhtml (Fedora) lp#458882
+- mail-notification-5.4-sasl_encode64.patch : Fix buffer overflow
+ (Fedora) lp#602623
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
mail-notification-5.4-eds-2.32.patch
mail-notification-5.4-evo2.29-gob2.patch
mail-notification-5.4-evolution-gtkhtml.patch
mail-notification-5.4-gob2-2.0.16.patch
mail-notification-5.4-sasl_encode64.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mail-notification.spec ++++++
--- /var/tmp/diff_new_pack.aR6OXG/_old 2010-09-13 18:32:37.000000000 +0200
+++ /var/tmp/diff_new_pack.aR6OXG/_new 2010-09-13 18:32:37.000000000 +0200
@@ -20,7 +20,7 @@
Name: mail-notification
Version: 5.4
-Release: 2
+Release: 3
License: GPL
Summary: Status icon checking for new mail
Url: http://www.nongnu.org/mailnotify/
@@ -28,10 +28,20 @@
Source: %{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM mail-notification-5.4-evo2.29.patch lp501624 fcrozat@novell.com -- Fix build with recent Evolution (from Fedora)
Patch1: mail-notification-5.4-evo2.29.patch
+# PATCH-FIX-UPSTREAM mail-notification-5.4-evo2.29.patch lp501624 fcrozat@novell.com -- Fix build with recent Evolution (from Fedora) gob2 part, only for 11.3 and later
+Patch8: mail-notification-5.4-evo2.29-gob2.patch
# PATCH-FIX-UPSTREAM mail-notification-5.4-missing-icons.patch lp557137 fcrozat@novell.com -- fix incorrect stock icons being used
Patch2: mail-notification-5.4-missing-icons.patch
# PATCH-FIX-UPSTREAM mail-notification-5.4-gmime.patch lp297094 fcrozat@novell.com -- Fix build with gmime 2.4
Patch3: mail-notification-5.4-gmime.patch
+# PATCH-FIX-UPSTREAM mail-notification-5.4-eds-2.32.patch fcrozat@novell.com -- Fix build with evolution 2.32
+Patch4: mail-notification-5.4-eds-2.32.patch
+# PATCH-FIX-UPSTREAM mail-notification-5.4-gob2-2.0.16.patch deb#580886 fcrozat@novell.com -- Fix build with gob2 2.0.16
+Patch5: mail-notification-5.4-gob2-2.0.16.patch
+# PATCH-FIX-UPSTREAM mail-notification-5.4-evolution-gtkhtml.patch lp#458882 fcrozat@novell.com -- Fix build with recent gtkhtml (Fedora)
+Patch6: mail-notification-5.4-evolution-gtkhtml.patch
+# PATCH-FIX-UPSTREAM mail-notification-5.4-sasl_encode64.patch lp#602623 fcrozat@novell.com -- Fix buffer overflow (Fedora)
+Patch7: mail-notification-5.4-sasl_encode64.patch
BuildRequires: evolution-data-server-devel
BuildRequires: evolution-devel
BuildRequires: gconf2-devel
@@ -56,9 +66,8 @@
BuildRequires: scrollkeeper
BuildRequires: startup-notification-devel
BuildRequires: update-desktop-files
-# needed for patch2
%if %suse_version >= 1130
-BuildRequires: gob2
+BuildRequires: gob2 >= 2.0.16
%endif
Requires: %{name}-lang = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -79,11 +88,27 @@
%patch1 -p1 -b .evolution-2.29
%endif
%if %suse_version >= 1130
+%patch8 -p1 -b .evolution-2.29-gob2
+%patch4 -p1 -b .eds-2.32
+%patch5 -p1 -b .gob2.0.16
%patch2 -p1 -b .incorrect-icons
%endif
%if 0%{?suse_version} > 1110 || 0%{?sles_version}
%patch3 -p1 -b .gmime24
%endif
+%if %suse_version < 1140
+%patch6 -p1 -b .gtkhtml
+%endif
+%patch7 -p1 -b .sasl_encode64
+
+# Drop #line statements in C sources generated bu .gob,
+# for the proper debuginfo package
+pushd build/src
+for f in *.c *.h
+do
+ sed -i '/^#line / d' $f
+done
+popd
%build
# See http://en.opensuse.org/Packaging/Fixing.
@@ -92,30 +117,22 @@
%endif
./jb configure prefix=%{_prefix} \
-%if %suse_version < 1130
- cflags="$(pkg-config --cflags libgtkhtml-3.14 gtkhtml-editor)" \
-%endif
sysconfdir=%{_sysconfdir} \
- destdir=%{buildroot}
-
-# CCFLAGS=%{optflags} make
+ cc="%{__cc}" \
+ cflags="%{optflags}" \
+ cppflags="-D_GNU_SOURCE" \
+ destdir=%{buildroot} \
+ gconf-schemas-dir=%{_sysconfdir}/gconf/schemas \
+ install-gconf-schemas=no
./jb build
%install
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-#DESTDIR=%{buildroot} make install
./jb install
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
# jb doesn't allow disabling scrollkeeper
rm -fr %{buildroot}%{_localstatedir}/lib/scrollkeeper
# sr@latin is the right locale name
mv %{buildroot}%{_datadir}/locale/sr@Latn %{buildroot}%{_datadir}/locale/sr@latin
-# schema file is mis-installed
-%if %suse_version >= 1120
-mkdir -p %{buildroot}%{_sysconfdir}/gconf/schemas
-mv %{buildroot}%{_datadir}/gconf/schemas/*.schemas %{buildroot}%{_sysconfdir}/gconf/schemas
-%endif
%find_gconf_schemas
%find_lang %{name}
%suse_update_desktop_file mail-notification
++++++ mail-notification-5.4-eds-2.32.patch ++++++
Index: mail-notification-5.4/src/mn-evolution-message.gob
===================================================================
--- mail-notification-5.4.orig/src/mn-evolution-message.gob
+++ mail-notification-5.4/src/mn-evolution-message.gob
@@ -23,7 +23,7 @@
%{
#include
-#include
+#include
#include "mn-evolution-mailbox.h"
#include "mn-message-private.h"
#include "mn-evolution-client.h"
Index: mail-notification-5.4/src/mn-evolution-plugin.c
===================================================================
--- mail-notification-5.4.orig/src/mn-evolution-plugin.c
+++ mail-notification-5.4/src/mn-evolution-plugin.c
@@ -24,7 +24,7 @@
#include
#include
#include
-#include
+#include
#include
#include
#include
Index: mail-notification-5.4/src/mn-evolution-server.gob
===================================================================
--- mail-notification-5.4.orig/src/mn-evolution-server.gob
+++ mail-notification-5.4/src/mn-evolution-server.gob
@@ -26,7 +26,7 @@
#include
#include
#include
-#include
+#include
#if EDS_CHECK_VERSION(2,29,0)
#include
#include
++++++ mail-notification-5.4-evo2.29-gob2.patch ++++++
Index: mail-notification-5.4/src/mn-evolution-folder-tree-server.gob
===================================================================
--- mail-notification-5.4.orig/src/mn-evolution-folder-tree-server.gob
+++ mail-notification-5.4/src/mn-evolution-folder-tree-server.gob
@@ -23,7 +23,10 @@
%{
#include
+#include
+#if !EDS_CHECK_VERSION(2,29,0)
#include
+#endif
#include
#include "mn-evolution-plugin.h"
#include "mn-evolution.h"
@@ -59,10 +62,14 @@ class MN:Evolution:Folder:Tree:Server
constructor (self)
{
+#if EDS_CHECK_VERSION(2,29,0)
+ selfp->tree = em_folder_tree_new();
+#else
EMFolderTreeModel *model;
model = mail_component_peek_tree_model(mail_component_peek());
selfp->tree = em_folder_tree_new_with_model(model);
+#endif
selfp->plug = gtk_plug_new((GdkNativeWindow) selfp->id);
gtk_container_add(GTK_CONTAINER(selfp->plug), selfp->tree);
Index: mail-notification-5.4/src/mn-evolution-server.gob
===================================================================
--- mail-notification-5.4.orig/src/mn-evolution-server.gob
+++ mail-notification-5.4/src/mn-evolution-server.gob
@@ -25,10 +25,16 @@
#include
#include
#include
+#include
#include
+#if EDS_CHECK_VERSION(2,29,0)
+#include
+#include
+#else
#include
#include
#include
+#endif
#include
#include
#include
@@ -235,7 +241,13 @@ class MN:Evolution:Server
for (i = 0; i < summary->len; i++)
{
+#if EDS_CHECK_VERSION(2,23,5)
+ char *uid = summary->pdata[i];
+ CamelMessageInfo *info = camel_folder_get_message_info(folder, uid);
+#else
CamelMessageInfo *info = summary->pdata[i];
+#endif
+
if ((camel_message_info_flags(info) & CAMEL_MESSAGE_SEEN) == 0)
g_ptr_array_add(*ret, self_camel_message_info_to_dbus_struct(info));
@@ -285,6 +297,19 @@ class MN:Evolution:Server
folder = self_lookup_folder(folder_uri, err);
if (folder)
{
+#if EDS_CHECK_VERSION(2,29,0)
+ EShell *shell;
+ EShellBackend *shell_backend;
+ GtkWidget *browser;
+
+ shell = e_shell_get_default ();
+ shell_backend = e_shell_get_backend_by_name (shell, "mail");
+
+ browser = e_mail_browser_new (shell_backend);
+ e_mail_reader_set_folder (E_MAIL_READER (browser), folder, folder_uri);
+ e_mail_reader_set_message (E_MAIL_READER (browser), message_uid);
+ gtk_widget_show (browser);
+#else
GtkWidget *browser;
/* modelled after Evolution's handleuri_got_folder() */
@@ -295,6 +320,7 @@ class MN:Evolution:Server
em_folder_view_set_folder((EMFolderView *) browser, folder, folder_uri);
em_folder_view_set_message((EMFolderView *) browser, message_uid, FALSE);
gtk_widget_show(((EMMessageBrowser *) browser)->window);
+#endif
camel_object_unref(folder);
}
++++++ mail-notification-5.4-evo2.29.patch ++++++
--- /var/tmp/diff_new_pack.aR6OXG/_old 2010-09-13 18:32:37.000000000 +0200
+++ /var/tmp/diff_new_pack.aR6OXG/_new 2010-09-13 18:32:37.000000000 +0200
@@ -94,12 +94,23 @@
===================================================================
--- mail-notification-5.4.orig/src/mn-evolution-plugin.c
+++ mail-notification-5.4/src/mn-evolution-plugin.c
-@@ -204,7 +204,7 @@ connect_to_session_bus (void)
+@@ -27,6 +27,7 @@
+ #include
+ #include
+ #include
++#include
+ #include "mn-evolution.h"
+ #include "mn-evolution-server.h"
+ #include "mn-evolution-plugin.h"
+@@ -204,7 +205,11 @@ connect_to_session_bus (void)
}
int
--e_plugin_lib_enable (EPluginLib *ep, int enable)
++#if EDS_CHECK_VERSION(2,29,0)
+e_plugin_lib_enable (EPlugin *ep, int enable)
++#else
+ e_plugin_lib_enable (EPluginLib *ep, int enable)
++#endif
{
static gboolean enabled = FALSE;
GError *err = NULL;
++++++ mail-notification-5.4-evolution-gtkhtml.patch ++++++
diff -Nrbu mail-notification-5.4/jbsrc/lib/src/extras/jb-evolution-plugin.c mail-notification-5.4-OK/jbsrc/lib/src/extras/jb-evolution-plugin.c
--- mail-notification-5.4/jbsrc/lib/src/extras/jb-evolution-plugin.c 2008-04-27 18:47:43.000000000 +0400
+++ mail-notification-5.4-OK/jbsrc/lib/src/extras/jb-evolution-plugin.c 2009-08-21 19:48:22.000000000 +0400
@@ -41,7 +41,7 @@
if (! minversion)
minversion = "2.12";
- packages = g_strdup_printf("evolution-plugin >= %s", minversion);
+ packages = g_strdup_printf("evolution-plugin >= %s libgtkhtml-3.14 gtkhtml-editor", minversion);
result = jb_check_packages("Evolution", "evolution-plugin", packages);
g_free(packages);
++++++ mail-notification-5.4-gob2-2.0.16.patch ++++++
Update .gob source to handle changes between gob2 2.0.15 and 2.0.16.
--- mail-notification-5.4.dfsg.1.orig/src/mn-authenticated-mailbox.gob
+++ mail-notification-5.4.dfsg.1/src/mn-authenticated-mailbox.gob
@@ -361,12 +361,12 @@
self->auth_failed = TRUE;
}
- [G_GNUC_PRINTF(3, 4)]
private gboolean
prompt_for_password (self,
char **password (check null),
const char *format (check null),
...)
+ attr {G_GNUC_PRINTF(3, 4)}
{
char *message;
gboolean ok;
--- mail-notification-5.4.dfsg.1.orig/src/mn-evolution-client.gob
+++ mail-notification-5.4.dfsg.1/src/mn-evolution-client.gob
@@ -33,7 +33,7 @@
* from unreferencing the proxy, so provide an eternal singleton
* proxy.
*/
-class MN:Evolution:Client
+class MN:Evolution:Client from G:Object
{
public DBusGProxy *proxy;
property POINTER proxy (link, export, type = DBusGProxy *);
--- mail-notification-5.4.dfsg.1.orig/src/mn-evolution-folder-tree-server.gob
+++ mail-notification-5.4.dfsg.1/src/mn-evolution-folder-tree-server.gob
@@ -31,7 +31,7 @@
#include "mn-evolution-folder-tree-server-dbus.h"
%}
-class MN:Evolution:Folder:Tree:Server
+class MN:Evolution:Folder:Tree:Server from G:Object
{
/* the GdkNativeWindow, which we also use as our ID */
private guint32 id;
--- mail-notification-5.4.dfsg.1.orig/src/mn-evolution-server.gob
+++ mail-notification-5.4.dfsg.1/src/mn-evolution-server.gob
@@ -65,7 +65,7 @@
* interface methods are run from a main loop callback.
*/
-class MN:Evolution:Server
+class MN:Evolution:Server from G:Object
{
signal NONE (STRING)
void folder_changed (self, const char *uri (check null));
--- mail-notification-5.4.dfsg.1.orig/src/mn-imap-mailbox.gob
+++ mail-notification-5.4.dfsg.1/src/mn-imap-mailbox.gob
@@ -1492,11 +1492,11 @@
return FALSE;
}
- [G_GNUC_PRINTF(2, 3)]
private int
session_write (MNClientSessionPrivate *priv (check null),
const char *format (check null),
...)
+ attr {G_GNUC_PRINTF(2, 3)}
{
char *command;
int result;
--- mail-notification-5.4.dfsg.1.orig/src/mn-mailbox-properties.gob
+++ mail-notification-5.4.dfsg.1/src/mn-mailbox-properties.gob
@@ -27,7 +27,7 @@
#include "mn-mailbox-properties-dialog.h"
%}
-class MN:Mailbox:Properties (abstract)
+class MN:Mailbox:Properties from G:Object (abstract)
{
classwide const char *type;
classwide const char *stock_id;
--- mail-notification-5.4.dfsg.1.orig/src/mn-mailbox.gob
+++ mail-notification-5.4.dfsg.1/src/mn-mailbox.gob
@@ -110,7 +110,7 @@
static unsigned int cleanup_messages_considered_as_read_idle_id = 0;
%}
-class MN:Mailbox (abstract)
+class MN:Mailbox from G:Object (abstract)
{
classwide const char *type;
classwide int default_check_delay = -1;
@@ -506,9 +506,9 @@
public char *error destroywith g_free;
property STRING error (link);
- [G_GNUC_PRINTF(2, 3)]
protected void
set_error (self, const char *format, ...)
+ attr {G_GNUC_PRINTF(2, 3)}
{
char *error = NULL;
@@ -634,9 +634,9 @@
self_filter_messages(self);
}
- [G_GNUC_NULL_TERMINATED]
public MNMailbox *
new (const char *type (check null), ...)
+ attr {G_GNUC_NULL_TERMINATED}
{
va_list args;
GType type_id;
@@ -1105,9 +1105,9 @@
: SELF_GET_CLASS(self)->default_check_delay;
}
- [G_GNUC_UNUSED] /* invoked via the class pointer */
virtual private MNMailbox *
- parse_uri (self, const char *uri (check null));
+ parse_uri (self, const char *uri (check null))
+ /*attr {G_GNUC_UNUSED}*/; /* invoked via the class pointer */
virtual public void
check (self)
@@ -1135,9 +1135,9 @@
self_check(self);
}
- [G_GNUC_PRINTF(2, 3)]
protected void
notice (self, const char *format (check null), ...)
+ attr {G_GNUC_PRINTF(2, 3)}
{
char *message;
@@ -1153,9 +1153,9 @@
g_free(message);
}
- [G_GNUC_PRINTF(2, 3)]
protected void
warning (self, const char *format (check null), ...)
+ attr {G_GNUC_PRINTF(2, 3)}
{
char *message;
--- mail-notification-5.4.dfsg.1.orig/src/mn-mailboxes.gob
+++ mail-notification-5.4.dfsg.1/src/mn-mailboxes.gob
@@ -39,7 +39,7 @@
#include "mn-util.h"
%}
-class MN:Mailboxes
+class MN:Mailboxes from G:Object
{
public GList *list; /* freed in finalize */
@@ -97,11 +97,11 @@
self_error_changed(self);
}
- [G_GNUC_UNUSED] /* we use g_signal_emit_by_name(), for passing a detail */
signal (DETAILED) private NONE (OBJECT, POINTER)
void mailbox_notify (self,
MN:Mailbox *mailbox (check null type),
- GParamSpec *pspec (check null));
+ GParamSpec *pspec (check null))
+ /*attr {G_GNUC_UNUSED}*/; /* we use g_signal_emit_by_name(), for passing a detail */
/**
* list-changed:
@@ -310,12 +310,12 @@
self_save(self);
}
- [G_GNUC_PRINTF(3, 4)]
private void
add_error (GString **errors (check null),
int *n_errors (check null),
const char *format,
...)
+ attr {G_GNUC_PRINTF(3, 4)}
{
char *message;
--- mail-notification-5.4.dfsg.1.orig/src/mn-maildir-message.gob
+++ mail-notification-5.4.dfsg.1/src/mn-maildir-message.gob
@@ -141,9 +141,9 @@
return NULL;
}
- [G_GNUC_PRINTF(2, 3)]
private GError *
delete_with_prompt (self, const char *format (check null), ...)
+ attr {G_GNUC_PRINTF(2, 3)}
{
GtkWidget *dialog;
char *prompt;
--- mail-notification-5.4.dfsg.1.orig/src/mn-message.gob
+++ mail-notification-5.4.dfsg.1/src/mn-message.gob
@@ -134,7 +134,7 @@
};
%}
-class MN:Message
+class MN:Message from G:Object
{
/*
* In order to not create reference cycles, we do not hold a
--- mail-notification-5.4.dfsg.1.orig/src/mn-popups.gob
+++ mail-notification-5.4.dfsg.1/src/mn-popups.gob
@@ -28,7 +28,7 @@
#include "mn-properties-dialog.h"
%}
-class MN:Popups
+class MN:Popups from G:Object
{
/*
* Maps message IDs to popups. If a message is known but has no
--- mail-notification-5.4.dfsg.1.orig/src/mn-server.gob
+++ mail-notification-5.4.dfsg.1/src/mn-server.gob
@@ -43,7 +43,7 @@
* main loop callback.
*/
-class MN:Server
+class MN:Server from G:Object
{
class_init (class)
{
--- mail-notification-5.4.dfsg.1.orig/src/mn-shell.gob
+++ mail-notification-5.4.dfsg.1/src/mn-shell.gob
@@ -73,7 +73,7 @@
NONE
} MN:Shell:Tooltip:Mail:Summary;
-class MN:Shell
+class MN:Shell from G:Object
{
public MNMailboxes *mailboxes;
--- mail-notification-5.4.dfsg.1.orig/src/mn-sound-player.gob
+++ mail-notification-5.4.dfsg.1/src/mn-sound-player.gob
@@ -31,7 +31,7 @@
#include "mn-util.h"
%}
-class MN:Sound:Player
+class MN:Sound:Player from G:Object
{
private gboolean can_play;
property BOOLEAN can_play (export)
--- mail-notification-5.4.dfsg.1.orig/src/mn-tooltips.gob
+++ mail-notification-5.4.dfsg.1/src/mn-tooltips.gob
@@ -71,7 +71,7 @@
#define GTK_PRIVATE_SET_FLAG(wid,flag) G_STMT_START{ (GTK_PRIVATE_FLAGS (wid) |= (PRIVATE_ ## flag)); }G_STMT_END
%}
-class MN:Tooltips
+class MN:Tooltips from G:Object
{
private GtkWidget *window;
private TooltipsData *active_data;
--- mail-notification-5.4.dfsg.1.orig/src/mn-vfs-mailbox-backend.gob
+++ mail-notification-5.4.dfsg.1/src/mn-vfs-mailbox-backend.gob
@@ -31,7 +31,7 @@
#include "mn-util.h"
%}
-class MN:VFS:Mailbox:Backend (abstract)
+class MN:VFS:Mailbox:Backend from G:Object (abstract)
{
classwide const char *format;
++++++ mail-notification-5.4-missing-icons.patch ++++++
--- /var/tmp/diff_new_pack.aR6OXG/_old 2010-09-13 18:32:37.000000000 +0200
+++ /var/tmp/diff_new_pack.aR6OXG/_new 2010-09-13 18:32:37.000000000 +0200
@@ -1,44 +1,39 @@
-From d3506e985ccb4d7ee80958cba8b45d98a118b93d Mon Sep 17 00:00:00 2001
-From: Frederic Crozat
-Date: Thu, 15 Apr 2010 11:30:27 +0200
-Subject: [PATCH] fix missing icons
-
----
- src/mn-popup.gob | 2 +-
- src/mn-stock.c | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/mn-popup.gob b/src/mn-popup.gob
-index aeb10d6..a13969e 100644
---- a/src/mn-popup.gob
-+++ b/src/mn-popup.gob
-@@ -48,7 +48,7 @@ class MN:Popup from Notify:Notification
-
- g_object_set(self,
- "body", body->str,
-- "icon-name", "stock_mail",
-+ "icon-name", "mail-unread",
- NULL);
-
- if (mn_conf_get_enum_value(MN_TYPE_POPUP_POSITION, MN_CONF_POPUPS_POSITION) == MN_POPUP_POSITION_ATTACHED)
-diff --git a/src/mn-stock.c b/src/mn-stock.c
-index ed62c14..c2cff1f 100644
---- a/src/mn-stock.c
-+++ b/src/mn-stock.c
-@@ -32,11 +32,11 @@ mn_stock_init (void)
+diff -Nrbu mail-notification-5.4/src/mn-stock.c mail-notification-5.4-OK/src/mn-stock.c
+--- mail-notification-5.4/src/mn-stock.c 2008-05-22 19:45:35.000000000 +0400
++++ mail-notification-5.4-OK/src/mn-stock.c 2010-05-24 19:36:03.000000000 +0400
+@@ -32,11 +32,11 @@
const char *icon_name;
const char *source_stock_id;
} icons[] = {
- { MN_STOCK_MAIL, NULL, "stock_mail" },
-+ { MN_STOCK_MAIL, NULL, "mail-unread" },
- { MN_STOCK_NO_MAIL, NULL, "stock_inbox" },
- { MN_STOCK_LOCAL, NULL, "stock_folder" },
- { MN_STOCK_REMOTE, NULL, "stock_internet" },
+- { MN_STOCK_NO_MAIL, NULL, "stock_inbox" },
+- { MN_STOCK_LOCAL, NULL, "stock_folder" },
+- { MN_STOCK_REMOTE, NULL, "stock_internet" },
- { MN_STOCK_UNKNOWN, NULL, "stock_unknown" },
++ { MN_STOCK_MAIL, NULL, "mail-message-new" },
++ { MN_STOCK_NO_MAIL, NULL, "mail-notification" },
++ { MN_STOCK_LOCAL, NULL, "folder" },
++ { MN_STOCK_REMOTE, NULL, "applications-internet" },
+ { MN_STOCK_UNKNOWN, NULL, "dialog-question" },
{ MN_STOCK_ERROR, NULL, NULL, GTK_STOCK_DIALOG_ERROR },
#if WITH_GMAIL
{ MN_STOCK_GMAIL, PKGDATADIR G_DIR_SEPARATOR_S "gmail.png" },
---
-1.7.0.5
-
+@@ -48,14 +48,14 @@
+ { MN_STOCK_HOTMAIL, PKGDATADIR G_DIR_SEPARATOR_S "hotmail.png" },
+ #endif
+ #if WITH_MBOX || WITH_MOZILLA || WITH_MH || WITH_MAILDIR || WITH_SYLPHEED
+- { MN_STOCK_SYSTEM_MAILBOX, NULL, "system" },
++ { MN_STOCK_SYSTEM_MAILBOX, NULL, "applications-system" },
+ #endif
+ #if WITH_EVOLUTION
+ { MN_STOCK_EVOLUTION_MAILBOX, NULL, "evolution" },
+ #endif
+- { MN_STOCK_MAIL_READER, NULL, "stock_mail-handling" },
+- { MN_STOCK_OPEN_MESSAGE, NULL, "stock_mail-open" },
+- { MN_STOCK_CONSIDER_NEW_MAIL_AS_READ, NULL, "stock_mark" }
++ { MN_STOCK_MAIL_READER, NULL, "mail-unread" },
++ { MN_STOCK_OPEN_MESSAGE, NULL, "mail-read" },
++ { MN_STOCK_CONSIDER_NEW_MAIL_AS_READ, NULL, "mail-mark-read" }
+ };
+ GtkIconFactory *factory;
+ GtkIconTheme *icon_theme;
++++++ mail-notification-5.4-sasl_encode64.patch ++++++
diff -up mail-notification-5.4/build/src/mn-pop3-mailbox.c mail-notification-5.4-OK/build/src/mn-pop3-mailbox.c
--- mail-notification-5.4/build/src/mn-pop3-mailbox.c 2009-05-19 10:29:58.448201837 +0200
+++ mail-notification-5.4-OK/build/src/mn-pop3-mailbox.c 2009-05-19 10:23:29.356204287 +0200
@@ -619,7 +619,7 @@ mn_pop3_mailbox_enter_auth_cb (MNClientS
if (initial_clientoutlen > 0)
{
- char buf64[initial_clientoutlen * 2]; /* Base64 is 33% larger than the data it encodes */
+ char buf64[initial_clientoutlen * 2 + 1]; /* Base64 is 33% larger than the data it encodes */
unsigned int outlen;
int result;
char *str;
diff -up mail-notification-5.4/src/mn-client-session.c mail-notification-5.4-OK/src/mn-client-session.c
--- mail-notification-5.4/src/mn-client-session.c 2008-05-22 17:45:35.000000000 +0200
+++ mail-notification-5.4-OK/src/mn-client-session.c 2009-05-19 10:29:09.112211055 +0200
@@ -1030,7 +1030,7 @@ mn_client_session_write (MNClientSession
static int
write_base64 (MNClientSession *session, const char *buf, unsigned int len)
{
- char buf64[len * 2]; /* Base64 is 33% larger than the data it encodes */
+ char buf64[len * 2 + 1]; /* Base64 is 33% larger than the data it encodes */
unsigned int outlen;
int result;
char *str;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org