Re: [Banshee-List] Remove the in-tree copy of notify-sharp

[Aaron Bockover <abockover novell com>]

notify-sharp is *tiny* and I don't see any reason to require it
externally. Is there a bug# for this, I didn't see one referenced in the
commit message.

--Aaron

-------- Forwarded Message --------
From: Bertrand Lorentz <blorentz src gnome org>
To: svn-commits-list gnome org
Subject: [banshee] Remove the in-tree copy of notify-sharp
Date: Thu, 14 May 2009 14:43:04 -0400 (EDT)

commit b28f9d36425e5c4260561316efe6dc6986642a42
Author: Bertrand Lorentz <bertrand lorentz gmail com>
Date:   Thu May 14 20:32:19 2009 +0200

    Remove the in-tree copy of notify-sharp
    
    External notify-sharp is now required.
---
 build/m4/banshee/notify-sharp.m4                   |   10 +-
 .../Banshee.NotificationArea/Makefile.am           |   11 -
 .../Notifications/Notification.cs                  |  325 --------------------
 .../Notifications/Notifications.cs                 |   52 ---
 4 files changed, 2 insertions(+), 396 deletions(-)

diff --git a/build/m4/banshee/notify-sharp.m4 b/build/m4/banshee/notify-sharp.m4
index bbe444a..3b5bd2b 100644
--- a/build/m4/banshee/notify-sharp.m4
+++ b/build/m4/banshee/notify-sharp.m4
@@ -1,12 +1,6 @@
 AC_DEFUN([BANSHEE_CHECK_NOTIFY_SHARP],
 [
-	PKG_CHECK_MODULES(NOTIFY_SHARP, notify-sharp, have_notify_sharp=yes, have_notify_sharp=no)
-	if test "x$have_notify_sharp" = "xyes"; then
-		AC_SUBST(NOTIFY_SHARP_LIBS)
-		AM_CONDITIONAL(EXTERNAL_NOTIFY_SHARP, true)
-	else
-		AM_CONDITIONAL(EXTERNAL_NOTIFY_SHARP, false)
-		AC_MSG_RESULT([no])
-	fi
+	PKG_CHECK_MODULES(NOTIFY_SHARP, notify-sharp)
+	AC_SUBST(NOTIFY_SHARP_LIBS)
 ])
 
diff --git a/src/Extensions/Banshee.NotificationArea/Makefile.am b/src/Extensions/Banshee.NotificationArea/Makefile.am
index 6b001ec..0b3f901 100644
--- a/src/Extensions/Banshee.NotificationArea/Makefile.am
+++ b/src/Extensions/Banshee.NotificationArea/Makefile.am
@@ -1,12 +1,3 @@
-REAL_NOTIFY_SHARP_SOURCES = Notifications/Notifications.cs Notifications/Notification.cs
-if EXTERNAL_NOTIFY_SHARP
-NOTIFY_SHARP_SOURCES = 
-NOTIFY_SHARP_LIBS = $(NOTIFY_SHARP_LIBS)
-else
-NOTIFY_SHARP_SOURCES = $(REAL_NOTIFY_SHARP_SOURCES)
-NOTIFY_SHARP_LIBS = 
-endif
-
 ASSEMBLY = Banshee.NotificationArea
 TARGET = library
 LINK = $(REF_EXTENSION_NOTIFICATIONAREA) $(NOTIFY_SHARP_LIBS)
@@ -20,8 +11,6 @@ SOURCES =  \
 	Banshee.NotificationArea/X11NotificationArea.cs \
 	Banshee.NotificationArea/X11NotificationAreaBox.cs
 
-SOURCES += $(NOTIFY_SHARP_SOURCES)
-
 RESOURCES =  \
 	Resources/Banshee.NotificationArea.addin.xml \
 	Resources/NotificationAreaMenu.xml
diff --git a/src/Extensions/Banshee.NotificationArea/Notifications/Notification.cs b/src/Extensions/Banshee.NotificationArea/Notifications/Notification.cs
deleted file mode 100644
index 459382f..0000000
--- a/src/Extensions/Banshee.NotificationArea/Notifications/Notification.cs
+++ /dev/null
@@ -1,325 +0,0 @@
-/*
- * Copyright (c) 2006 Sebastian Dröge <slomo circular-chaos org>
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-using System;
-using System.Reflection;
-using System.Collections.Generic;
-
-using GLib;
-using Gdk;
-using Gtk;
-
-using NDesk.DBus;
-using org.freedesktop;
-using org.freedesktop.DBus;
-using org.freedesktop.Notifications;
-
-namespace Notifications {
-	public enum Urgency : byte {
-		Low = 0,
-		Normal,
-		Critical
-	}
-
-	public class ActionArgs : EventArgs {
-		private string action;
-		public string Action {
-			get { return action; }
-		}
-
-		public ActionArgs (string action) {
-			this.action = action;
-		}
-	}
-
-	public delegate void ActionHandler (object o, ActionArgs args);
-	
-	public class Notification {
-		private struct IconData {
-			public int Width;
-			public int Height;
-			public int Rowstride;
-			public bool HasAlpha;
-			public int BitsPerSample;
-			public int NChannels;
-			public byte[] Pixels;		
-		}
-
-		private struct ActionTuple {
-			public string Label;
-			public ActionHandler Handler;
-
-			public ActionTuple (string label, ActionHandler handler) {
-				Label = label;
-				Handler = handler;
-			}
-		}
-
-		private const string bus_name = "org.freedesktop.Notifications";
-		private const string object_path = "/org/freedesktop/Notifications";
-		private INotifications nf;
-
-		private bool updates_pending = false;
-		private bool shown = false;
-
-		private string app_name;
-		private uint id = 0;
-		private int timeout = -1;
-		private string summary = String.Empty, body = String.Empty;
-		private string icon = String.Empty;
-		private IDictionary <string, ActionTuple> action_map = new Dictionary<string, ActionTuple> ();
-		private IDictionary <string, object> hints  = new Dictionary<string, object> ();
-
-		public event EventHandler Closed;
-		
-		public Notification () {
-			if (! Bus.Session.NameHasOwner (bus_name))
-				Bus.Session.StartServiceByName (bus_name, 0);
-
-			nf = Bus.Session.GetObject<INotifications>
-				(bus_name, new ObjectPath (object_path));
-			if (nf == null)
-				throw new ApplicationException ("Couldn't get org.freedesktop.Notifications DBus object!");
-
-			nf.NotificationClosed += OnClosed;
-			nf.ActionInvoked += OnActionInvoked;
-
-			this.app_name = Assembly.GetCallingAssembly().GetName().Name;
-		}
-
-		public Notification (string summary, string body) : this () {
-			this.summary = summary;
-			this.body = body;
-		}
-
-		public Notification (string summary, string body, string icon) : this (summary, body) {
-			this.icon = icon;
-		}
-
-		public Notification (string summary, string body, Pixbuf icon) : this (summary, body) {
-			SetPixbufHint (icon);
-		}
-
-		public Notification (string summary, string body, Pixbuf icon, Gtk.Widget widget) : this (summary, body, icon) {
-			AttachToWidget (widget);
-		}
-		
-		public Notification (string summary, string body, string icon, Gtk.Widget widget) : this (summary, body, icon) {
-			AttachToWidget (widget);
-		}
-
-		public string Summary {
-			set {
-				summary = value;
-				Update ();
-			}
-			get {
-				return summary;
-			}
-		}
-
-		public string Body {
-			set {
-				body = value;
-				Update ();
-			}
-			get {
-				return body;
-			}
-		}
-
-		public int Timeout {
-			set {
-				timeout = value;
-				Update ();
-			}
-			get {
-				return timeout;
-			}
-		}
-
-		public Urgency Urgency {
-			set {
-				hints["urgency"] = (byte) value;
-				Update ();
-			}
-			get {
-				return hints.ContainsKey ("urgency") ? (Urgency) hints["urgency"] : Urgency.Normal;
-			}
-		}
-
-		public string Category {
-			set {
-				hints["category"] = value;
-				Update ();
-			}
-			get {
-				return hints.ContainsKey ("category") ? (string) hints["category"] : String.Empty;
-			}
-
-		}
-
-		public Pixbuf Icon {
-			set {
-				SetPixbufHint (value);
-				icon = String.Empty;
-				Update ();
-			}
-		}
-
-		public string IconName {
-			set {
-				icon = value;
-				hints.Remove ("icon_data");
-				Update ();
-			}
-		}
-
-		private void SetPixbufHint (Pixbuf pixbuf) {
-			IconData icon_data = new IconData ();
-			icon_data.Width = pixbuf.Width;
-			icon_data.Height = pixbuf.Height;
-			icon_data.Rowstride = pixbuf.Rowstride;
-			icon_data.HasAlpha = pixbuf.HasAlpha;
-			icon_data.BitsPerSample = pixbuf.BitsPerSample;
-			icon_data.NChannels = pixbuf.NChannels;
-
-			int len = (icon_data.Height - 1) * icon_data.Rowstride + icon_data.Width *
-				((icon_data.NChannels * icon_data.BitsPerSample + 7) / 8);
-			icon_data.Pixels = new byte[len];
-			System.Runtime.InteropServices.Marshal.Copy (pixbuf.Pixels, icon_data.Pixels, 0, len);
-
-			hints["icon_data"] = icon_data;
-		}
-
-		public void AttachToWidget (Gtk.Widget widget) {
-			int x, y;
-			
-			if (widget == null) {
-			    return;
-			}
-
-			widget.GdkWindow.GetOrigin (out x, out y);
-
-			if (widget.GetType() != typeof (Gtk.Window) || ! widget.GetType().IsSubclassOf(typeof (Gtk.Window))) {
-				x += widget.Allocation.X;
-				y += widget.Allocation.Y;
-			}
-
-			x += widget.Allocation.Width / 2;
-			y += widget.Allocation.Height / 2;
-
-			SetGeometryHints (widget.Screen, x, y);
-		}
-
-		public void SetGeometryHints (Screen screen, int x, int y) {
-			hints["x"] = x;
-			hints["y"] = y;
-			hints["xdisplay"] = screen.MakeDisplayName ();
-			Update ();
-		}
-
-		private void Update () {
-			if (shown && !updates_pending) {
-				updates_pending = true;
-				GLib.Timeout.Add (100, delegate {
-					if (updates_pending) {
-						Show ();
-						updates_pending = false;
-					}
-					return false;
-				});
-			}
-		}
-		
-		public void Show () {
-			string[] actions;
-			lock (action_map) {
-				actions = new string[action_map.Keys.Count * 2];
-				int i = 0;
-				foreach (KeyValuePair<string,ActionTuple> pair in action_map) {
-					actions[i++] = pair.Key;
-					actions[i++] = pair.Value.Label;
-				}
-			}
-			id = nf.Notify (app_name, id, icon, summary, body, actions, hints, timeout);
-			shown = true;
-		}
-
-		public void Close () {
-			nf.CloseNotification (id);
-			id = 0;
-			shown = false;
-		}
-
-		private void OnClosed (uint id) {
-			if (this.id == id) {
-				this.id = 0;
-				shown = false;
-				if (Closed != null) {
-					Closed (this, new EventArgs ());
-				}
-			}
-		}
-
-		public void AddAction (string action, string label, ActionHandler handler) {
-			if (nf.Capabilities != null &&
-			    Array.IndexOf (nf.Capabilities, "actions") > -1) {
-				lock (action_map) {
-					action_map[action] = new ActionTuple (label, handler);
-				}
-				Update ();
-			}
-		}
-
-		public void RemoveAction (string action) {
-			lock (action_map) {
-				action_map.Remove (action);
-			}
-			Update ();
-		}
-
-		public void ClearActions () {
-			lock (action_map) {
-				action_map.Clear ();
-			}
-			Update ();
-		}
-
-		private void OnActionInvoked (uint id, string action) {
-			lock (action_map) {
-				if (this.id == id && action_map.ContainsKey (action))
-					action_map[action].Handler (this, new ActionArgs (action));
-			}
-		}
-
-		public void AddHint (string name, object value) {
-			hints[name] = value;
-			Update ();
-		}
-
-		public void RemoveHint (string name) {
-			hints.Remove (name);
-			Update ();
-		}
-	}
-}
diff --git a/src/Extensions/Banshee.NotificationArea/Notifications/Notifications.cs b/src/Extensions/Banshee.NotificationArea/Notifications/Notifications.cs
deleted file mode 100644
index 06e0f7e..0000000
--- a/src/Extensions/Banshee.NotificationArea/Notifications/Notifications.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2006 Sebastian Dröge <slomo circular-chaos org>
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-
-using System;
-using System.Collections.Generic;
-
-using NDesk.DBus;
-using org.freedesktop;
-using org.freedesktop.DBus;
-
-namespace org.freedesktop.Notifications {
-	public struct ServerInformation {
-		public string Name;
-		public string Vendor;
-		public string Version;
-		public string SpecVersion;
-	}
-
-	[Interface ("org.freedesktop.Notifications")]
-	public interface INotifications : Introspectable, Properties {
-		ServerInformation ServerInformation { get; }
-		string[] Capabilities { get; }
-		void CloseNotification (uint id);
-		uint Notify (string app_name, uint id, string icon, string summary, string body,
-			string[] actions, IDictionary<string, object> hints, int timeout);
-		event NotificationClosedHandler NotificationClosed;
-		event ActionInvokedHandler ActionInvoked;
-	}
-
-	public delegate void NotificationClosedHandler (uint id);
-	public delegate void ActionInvokedHandler (uint id, string action);
-}
-
_______________________________________________
SVN-commits-list mailing list (read only)
http://mail.gnome.org/mailman/listinfo/svn-commits-list

Want to limit the commits to a few modules? Go to above URL, log in to edit your options and select the modules ('topics') you want.