summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Johanson <latexer@gentoo.org>2005-02-18 14:28:40 +0000
committerPeter Johanson <latexer@gentoo.org>2005-02-18 14:28:40 +0000
commit1c2256953f26701c9e464170a6a953c4609f15be (patch)
tree03af8ecd70832601af29bae59d3ba926fd366bf9 /app-misc/tomboy
parentMoved texmf-update creation process to tetex_src_unpack(). (bug #82423) (diff)
downloadgentoo-2-1c2256953f26701c9e464170a6a953c4609f15be.tar.gz
gentoo-2-1c2256953f26701c9e464170a6a953c4609f15be.tar.bz2
gentoo-2-1c2256953f26701c9e464170a6a953c4609f15be.zip
Fix the 1.1.4-compat patch to work on mono-1.0.x.
(Portage version: 2.0.51.16)
Diffstat (limited to 'app-misc/tomboy')
-rw-r--r--app-misc/tomboy/ChangeLog6
-rw-r--r--app-misc/tomboy/files/tomboy-0.3.1-mono-1.1.4-compat.diff10
2 files changed, 10 insertions, 6 deletions
diff --git a/app-misc/tomboy/ChangeLog b/app-misc/tomboy/ChangeLog
index 92cc3763db52..2ae5adf833a2 100644
--- a/app-misc/tomboy/ChangeLog
+++ b/app-misc/tomboy/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-misc/tomboy
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/ChangeLog,v 1.4 2005/02/18 04:22:52 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/ChangeLog,v 1.5 2005/02/18 14:28:40 latexer Exp $
+
+ 18 Feb 2005; Peter Johanson <latexer@gentoo.org>
+ files/tomboy-0.3.1-mono-1.1.4-compat.diff:
+ Fix the 1.1.4-compat patch to work on mono-1.0.x.
*tomboy-0.3.1 (17 Feb 2005)
diff --git a/app-misc/tomboy/files/tomboy-0.3.1-mono-1.1.4-compat.diff b/app-misc/tomboy/files/tomboy-0.3.1-mono-1.1.4-compat.diff
index afd749d072f5..44ca2beefa5f 100644
--- a/app-misc/tomboy/files/tomboy-0.3.1-mono-1.1.4-compat.diff
+++ b/app-misc/tomboy/files/tomboy-0.3.1-mono-1.1.4-compat.diff
@@ -1,6 +1,6 @@
diff -aur tomboy-0.3.1-orig/Tomboy/Applet.cs tomboy-0.3.1/Tomboy/Applet.cs
--- tomboy-0.3.1-orig/Tomboy/Applet.cs 2005-01-18 06:32:37.000000000 -0500
-+++ tomboy-0.3.1/Tomboy/Applet.cs 2005-02-15 10:48:16.823646424 -0500
++++ tomboy-0.3.1/Tomboy/Applet.cs 2005-02-18 09:15:39.636662296 -0500
@@ -7,7 +7,7 @@
namespace Tomboy
@@ -17,7 +17,7 @@ diff -aur tomboy-0.3.1-orig/Tomboy/Applet.cs tomboy-0.3.1/Tomboy/Applet.cs
+
+ // This is needed as on mono-1.1.4, the whole
+ // applet gets reaped, including needed menu_verbs
-+ GLib.Timeout.Add(1000, ImALIVE);
++ GLib.Timeout.Add(1000, new GLib.TimeoutHandler(ImALIVE));
}
void ShowPreferencesVerb ()
@@ -35,7 +35,7 @@ diff -aur tomboy-0.3.1-orig/Tomboy/Applet.cs tomboy-0.3.1/Tomboy/Applet.cs
// This is needed to support transparent panel
diff -aur tomboy-0.3.1-orig/Tomboy/panelapplet/generated/ChangeBackgroundHandler.cs tomboy-0.3.1/Tomboy/panelapplet/generated/ChangeBackgroundHandler.cs
--- tomboy-0.3.1-orig/Tomboy/panelapplet/generated/ChangeBackgroundHandler.cs 2004-10-23 14:21:58.000000000 -0400
-+++ tomboy-0.3.1/Tomboy/panelapplet/generated/ChangeBackgroundHandler.cs 2005-02-15 10:48:16.824646272 -0500
++++ tomboy-0.3.1/Tomboy/panelapplet/generated/ChangeBackgroundHandler.cs 2005-02-18 07:51:37.000000000 -0500
@@ -8,9 +8,9 @@
public delegate void ChangeBackgroundHandler(object o, ChangeBackgroundArgs args);
@@ -50,7 +50,7 @@ diff -aur tomboy-0.3.1-orig/Tomboy/panelapplet/generated/ChangeBackgroundHandler
diff -aur tomboy-0.3.1-orig/Tomboy/panelapplet/generated/FactoryCallback.cs tomboy-0.3.1/Tomboy/panelapplet/generated/FactoryCallback.cs
--- tomboy-0.3.1-orig/Tomboy/panelapplet/generated/FactoryCallback.cs 2004-10-23 14:21:58.000000000 -0400
-+++ tomboy-0.3.1/Tomboy/panelapplet/generated/FactoryCallback.cs 2005-02-15 10:48:16.824646272 -0500
++++ tomboy-0.3.1/Tomboy/panelapplet/generated/FactoryCallback.cs 2005-02-18 07:51:38.000000000 -0500
@@ -5,6 +5,6 @@
using System;
@@ -61,7 +61,7 @@ diff -aur tomboy-0.3.1-orig/Tomboy/panelapplet/generated/FactoryCallback.cs tomb
}
diff -aur tomboy-0.3.1-orig/Tomboy/panelapplet/generated/PanelApplet.cs tomboy-0.3.1/Tomboy/panelapplet/generated/PanelApplet.cs
--- tomboy-0.3.1-orig/Tomboy/panelapplet/generated/PanelApplet.cs 2004-10-31 21:55:25.000000000 -0500
-+++ tomboy-0.3.1/Tomboy/panelapplet/generated/PanelApplet.cs 2005-02-15 10:48:16.826645968 -0500
++++ tomboy-0.3.1/Tomboy/panelapplet/generated/PanelApplet.cs 2005-02-18 07:51:38.000000000 -0500
@@ -37,7 +37,7 @@
static void changebackground_cb (IntPtr applet, int type, ref Gdk.Color color, IntPtr pixmap)
{