Attachment 1653 Details for Bug 3248 – Proposed patch to prevent a crash when evolution is not installed

[patch] Proposed patch to prevent a crash when evolution is not installed

evolution.icon.diff (text/plain), 2.10 KB, created by Remco Rijnders on 2012-02-28 17:09:48 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Remco Rijnders

Created: 2012-02-28 17:09:48 CET

Size: 2.10 KB

patch

obsolete

>Index: SOURCES/mail-notification-5.4-missing-icons.patch
>===================================================================
>--- SOURCES/mail-notification-5.4-missing-icons.patch	(revision 215823)
>+++ SOURCES/mail-notification-5.4-missing-icons.patch	(working copy)
>@@ -38,7 +38,8 @@
> +    { MN_STOCK_SYSTEM_MAILBOX,		NULL, "applications-system" },
>  #endif
>  #if WITH_EVOLUTION
>-     { MN_STOCK_EVOLUTION_MAILBOX,	NULL, "evolution" },
>+-    { MN_STOCK_EVOLUTION_MAILBOX,	NULL, "evolution" },
>++    { MN_STOCK_EVOLUTION_MAILBOX,	PKGDATADIR G_DIR_SEPARATOR_S "evolution.png" },
>  #endif
> -    { MN_STOCK_MAIL_READER,		NULL, "stock_mail-handling" },
> -    { MN_STOCK_OPEN_MESSAGE,		NULL, "stock_mail-open" },
>@@ -50,3 +51,14 @@
>    GtkIconFactory *factory;
>    GtkIconTheme *icon_theme;
> 
>+--- a/jbsrc/jb.c	2012-02-28 16:47:24.989827330 +0100
>++++ b/jbsrc/jb.c	2012-02-28 16:52:09.954552989 +0100
>+@@ -364,6 +364,8 @@
>+   if (jb_variable_get_bool("hotmail"))
>+     jb_group_add_data_file(group, "hotmail.png", "$pkgdatadir");
>+ 
>++  jb_group_add_data_file(group, "evolution.png", "$pkgdatadir");
>++
>+   rule = jb_rule_new();
>+   jb_rule_set_install_message(rule, "updating the GTK+ icon cache");
>+   jb_rule_add_install_command(rule, "-gtk-update-icon-cache -f -t $datadir/icons/hicolor");
>Index: SPECS/mail-notification.spec
>===================================================================
>--- SPECS/mail-notification.spec	(revision 215823)
>+++ SPECS/mail-notification.spec	(working copy)
>@@ -7,11 +7,12 @@
> Version: 	%{version}
> Summary: 	New mail status tray icon
> Name: 		%{name}
>-Release: 	%mkrel 15
>+Release: 	%mkrel 16
> License: 	GPLv3+ and GFDL+
> Group: 		Networking/Mail
> Source: 	http://savannah.nongnu.org/download/mailnotify/%{fname}.tar.bz2
> Source1: 	http://savannah.nongnu.org/download/mailnotify/%{fname}.tar.bz2.sig
>+Source2:	evolution.png
> #gw from Fedora, port to Evolution 2.31 API
> #gw patch generated C sources
> Patch: mail-notification-5.4-evo2.31.patch
>@@ -75,6 +76,7 @@
> 
> %setup -q -n %fname
> %apply_patches
>+cp %{SOURCE2} art/
> 
> # Drop #line statements in C sources generated bu .gob,
> # for the proper debuginfo package

Index: SOURCES/mail-notification-5.4-missing-icons.patch
===================================================================
--- SOURCES/mail-notification-5.4-missing-icons.patch	(revision 215823)
+++ SOURCES/mail-notification-5.4-missing-icons.patch	(working copy)
@@ -38,7 +38,8 @@
 +    { MN_STOCK_SYSTEM_MAILBOX,		NULL, "applications-system" },
  #endif
  #if WITH_EVOLUTION
-     { MN_STOCK_EVOLUTION_MAILBOX,	NULL, "evolution" },
+-    { MN_STOCK_EVOLUTION_MAILBOX,	NULL, "evolution" },
++    { MN_STOCK_EVOLUTION_MAILBOX,	PKGDATADIR G_DIR_SEPARATOR_S "evolution.png" },
  #endif
 -    { MN_STOCK_MAIL_READER,		NULL, "stock_mail-handling" },
 -    { MN_STOCK_OPEN_MESSAGE,		NULL, "stock_mail-open" },
@@ -50,3 +51,14 @@
    GtkIconFactory *factory;
    GtkIconTheme *icon_theme;
 
+--- a/jbsrc/jb.c	2012-02-28 16:47:24.989827330 +0100
++++ b/jbsrc/jb.c	2012-02-28 16:52:09.954552989 +0100
+@@ -364,6 +364,8 @@
+   if (jb_variable_get_bool("hotmail"))
+     jb_group_add_data_file(group, "hotmail.png", "$pkgdatadir");
+ 
++  jb_group_add_data_file(group, "evolution.png", "$pkgdatadir");
++
+   rule = jb_rule_new();
+   jb_rule_set_install_message(rule, "updating the GTK+ icon cache");
+   jb_rule_add_install_command(rule, "-gtk-update-icon-cache -f -t $datadir/icons/hicolor");
Index: SPECS/mail-notification.spec
===================================================================
--- SPECS/mail-notification.spec	(revision 215823)
+++ SPECS/mail-notification.spec	(working copy)
@@ -7,11 +7,12 @@
 Version: 	%{version}
 Summary: 	New mail status tray icon
 Name: 		%{name}
-Release: 	%mkrel 15
+Release: 	%mkrel 16
 License: 	GPLv3+ and GFDL+
 Group: 		Networking/Mail
 Source: 	http://savannah.nongnu.org/download/mailnotify/%{fname}.tar.bz2
 Source1: 	http://savannah.nongnu.org/download/mailnotify/%{fname}.tar.bz2.sig
+Source2:	evolution.png
 #gw from Fedora, port to Evolution 2.31 API
 #gw patch generated C sources
 Patch: mail-notification-5.4-evo2.31.patch
@@ -75,6 +76,7 @@
 
 %setup -q -n %fname
 %apply_patches
+cp %{SOURCE2} art/
 
 # Drop #line statements in C sources generated bu .gob,
 # for the proper debuginfo package

Actions: View | Diff

Attachments on bug 3248: 1037 | 1653