[Pkg-mono-svn-commits] rev 2250 - ipod-sharp/trunk/debian
libipoddevice/trunk/debian non-group/banshee/trunk/debian
non-group/banshee/trunk/debian/patches
Sebastian Dröge
slomo-guest at costa.debian.org
Mon Feb 13 10:42:49 UTC 2006
Author: slomo-guest
Date: 2006-02-13 10:42:18 +0000 (Mon, 13 Feb 2006)
New Revision: 2250
Removed:
non-group/banshee/trunk/debian/patches/01_fix-dllmaps.diff
non-group/banshee/trunk/debian/patches/02_dbus0.6.diff
non-group/banshee/trunk/debian/patches/06_fix-Encoding-ASCII-null-termination.diff
non-group/banshee/trunk/debian/patches/07_fix-daap-segfault.diff
non-group/banshee/trunk/debian/patches/08_notification-area-icon-64bit.diff
Modified:
ipod-sharp/trunk/debian/changelog
ipod-sharp/trunk/debian/compat
ipod-sharp/trunk/debian/control
libipoddevice/trunk/debian/changelog
libipoddevice/trunk/debian/compat
libipoddevice/trunk/debian/control
non-group/banshee/trunk/debian/changelog
non-group/banshee/trunk/debian/control
Log:
* updated banshee, ipod-sharp and libipoddevice
Modified: ipod-sharp/trunk/debian/changelog
===================================================================
--- ipod-sharp/trunk/debian/changelog 2006-02-13 09:34:27 UTC (rev 2249)
+++ ipod-sharp/trunk/debian/changelog 2006-02-13 10:42:18 UTC (rev 2250)
@@ -1,3 +1,10 @@
+ipod-sharp (0.5.15-1) unstable; urgency=low
+
+ * New upstream release
+ * Update to debhelper compat version 5
+
+ -- Sebastian Dröge <slomo at ubuntu.com> Mon, 13 Feb 2006 10:56:18 +0100
+
ipod-sharp (0.5.12-3) unstable; urgency=low
* Upload to unstable
Modified: ipod-sharp/trunk/debian/compat
===================================================================
--- ipod-sharp/trunk/debian/compat 2006-02-13 09:34:27 UTC (rev 2249)
+++ ipod-sharp/trunk/debian/compat 2006-02-13 10:42:18 UTC (rev 2250)
@@ -1 +1 @@
-4
+5
Modified: ipod-sharp/trunk/debian/control
===================================================================
--- ipod-sharp/trunk/debian/control 2006-02-13 09:34:27 UTC (rev 2249)
+++ ipod-sharp/trunk/debian/control 2006-02-13 10:42:18 UTC (rev 2250)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
Uploaders: Sebastian Dröge <slomo at ubuntu.com>
-Build-Depends-Indep: debhelper (>= 4.1.0), cdbs, cli-common (>= 0.2.0), mono-mcs (>= 1.0) | c-sharp-compiler, mono-gac (>= 1.0), libipoddevice-dev (>= 0.4.0), libgtk2.0-cil, libglib2.0-cil, pkg-config, monodoc-base (>= 1.1.9)
+Build-Depends-Indep: debhelper (>= 5), cdbs, cli-common (>= 0.2.0), mono-mcs (>= 1.0) | c-sharp-compiler, mono-gac (>= 1.0), libipoddevice-dev (>= 0.4.0), libgtk2.0-cil, libglib2.0-cil, pkg-config, monodoc-base (>= 1.1.9)
Standards-Version: 3.6.2
Package: libipod-cil
Modified: libipoddevice/trunk/debian/changelog
===================================================================
--- libipoddevice/trunk/debian/changelog 2006-02-13 09:34:27 UTC (rev 2249)
+++ libipoddevice/trunk/debian/changelog 2006-02-13 10:42:18 UTC (rev 2250)
@@ -1,3 +1,11 @@
+libipoddevice (0.4.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Update to debhelper compat version 5
+ * Remove pmount / eject Depend on ipod as only libipoddevice0 needs it
+
+ -- Sebastian Dröge <slomo at ubuntu.com> Mon, 13 Feb 2006 10:47:57 +0100
+
libipoddevice (0.4.0-2) unstable; urgency=low
* Upload to unstable
Modified: libipoddevice/trunk/debian/compat
===================================================================
--- libipoddevice/trunk/debian/compat 2006-02-13 09:34:27 UTC (rev 2249)
+++ libipoddevice/trunk/debian/compat 2006-02-13 10:42:18 UTC (rev 2250)
@@ -1 +1 @@
-4
+5
Modified: libipoddevice/trunk/debian/control
===================================================================
--- libipoddevice/trunk/debian/control 2006-02-13 09:34:27 UTC (rev 2249)
+++ libipoddevice/trunk/debian/control 2006-02-13 10:42:18 UTC (rev 2250)
@@ -3,13 +3,13 @@
Priority: optional
Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
Uploaders: Sebastian Dröge <slomo at ubuntu.com>
-Build-Depends: debhelper (>= 4.1.0), cdbs, eject, pmount, pkg-config, libglib2.0-dev, libdbus-glib-1-dev, libhal-dev (>= 0.5.2), libgtop2-dev (>= 2.12.0)
+Build-Depends: debhelper (>= 5), cdbs, pkg-config, libglib2.0-dev, libdbus-glib-1-dev, libhal-dev (>= 0.5.6), libgtop2-dev (>= 2.12.0), pmount, eject
Standards-Version: 3.6.2
Package: ipod
Architecture: any
Section: utils
-Depends: ${shlibs:Depends}, eject, pmount
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: tool for retrieving informations from iPods
libipoddevice provides basic low level device information about iPod devices.
The library makes it extremely easy to detect iPods. Basic metadata the
@@ -22,7 +22,7 @@
Package: libipoddevice0
Architecture: any
-Depends: ${shlibs:Depends}, eject, pmount
+Depends: ${shlibs:Depends}, ${misc:Depends}, pmount, eject
Description: library for retrieving informations from iPods
libipoddevice provides basic low level device information about iPod devices.
The library makes it extremely easy to detect iPods. Basic metadata the
Modified: non-group/banshee/trunk/debian/changelog
===================================================================
--- non-group/banshee/trunk/debian/changelog 2006-02-13 09:34:27 UTC (rev 2249)
+++ non-group/banshee/trunk/debian/changelog 2006-02-13 10:42:18 UTC (rev 2250)
@@ -1,3 +1,18 @@
+banshee (0.10.6-1) unstable; urgency=low
+
+ * New upstream release
+ * 06_fix-Encoding-ASCII-null-termination.diff,
+ 07_fix-daap-segfault.diff,
+ 08_notification-area-icon-64bit.diff:
+ - Dropped, included upstream
+ * Tighten Build-Depend:
+ + libipod-cil (>= 0.5.15)
+ + mono-mcs and libmono-dev (>= 1.1.10)
+ + libsqlite3-dev (>= 3.2)
+ + libgtk2-dev (>= 2.8)
+
+ -- Sebastian Dröge <slomo at ubuntu.com> Mon, 13 Feb 2006 11:03:30 +0100
+
banshee (0.10.5-1) unstable; urgency=low
* New upstream release (Closes: #349117)
Modified: non-group/banshee/trunk/debian/control
===================================================================
--- non-group/banshee/trunk/debian/control 2006-02-13 09:34:27 UTC (rev 2249)
+++ non-group/banshee/trunk/debian/control 2006-02-13 10:42:18 UTC (rev 2250)
@@ -2,12 +2,12 @@
Section: sound
Priority: optional
Maintainer: Sebastian Dröge <slomo at ubuntu.com>
-Build-Depends: debhelper (>= 5), cdbs, cli-common (>= 0.2.0), mono-mcs (>= 1.0) | c-sharp-compiler, libmono-dev, libgtk2.0-cil (>= 2.8.0), libglib2.0-cil (>= 2.8.0), libgnome2.0-cil (>= 2.8.0), libgconf2.0-cil (>= 2.8.0), libglade2.0-cil (>= 2.8.0), libipod-cil (>= 0.5.12), libnjb-cil (>= 0.2.1), libdbus-1-cil, libsqlite3-dev, libgstreamer0.8-dev (>= 0.8.11), libgstreamer-gconf0.8-dev (>= 0.8.11), libgstreamer-plugins0.8-dev (>= 0.8.11), gstreamer0.8-misc (>= 0.8.11), libglib2.0-dev, libgnome2-dev, libgnomeui-dev, libgconf2-dev, gconf2, libgtk2.0-dev (>= 2.6.0), libgnomevfs2-dev, libgnome-desktop-dev, libdbus-1-dev, libdbus-glib-1-dev, libhal-dev (>= 0.5.2), libnautilus-burn-dev (>= 2.12.0), libmusicbrainz4-dev (>= 2.1.1), libavahi-cil (>= 0.6), pkg-config, intltool
+Build-Depends: debhelper (>= 5), cdbs, cli-common (>= 0.2.0), mono-mcs (>= 1.1.10) | c-sharp-compiler, libmono-dev (>= 1.1.10), libgtk2.0-cil (>= 2.8.0), libglib2.0-cil (>= 2.8.0), libgnome2.0-cil (>= 2.8.0), libgconf2.0-cil (>= 2.8.0), libglade2.0-cil (>= 2.8.0), libipod-cil (>= 0.5.15), libnjb-cil (>= 0.2.1), libdbus-1-cil, libsqlite3-dev (>= 3.2), libgstreamer0.8-dev (>= 0.8.11), libgstreamer-gconf0.8-dev (>= 0.8.11), libgstreamer-plugins0.8-dev (>= 0.8.11), gstreamer0.8-misc (>= 0.8.11), libglib2.0-dev, libgnome2-dev, libgnomeui-dev, libgconf2-dev, gconf2, libgtk2.0-dev (>= 2.8), libgnomevfs2-dev, libgnome-desktop-dev, libdbus-1-dev, libdbus-glib-1-dev, libhal-dev (>= 0.5.2), libnautilus-burn-dev (>= 2.12.0), libmusicbrainz4-dev (>= 2.1.1), libavahi-cil (>= 0.6), pkg-config, intltool
Standards-Version: 3.6.2
Package: banshee
Architecture: any
-Depends: ${shlibs:Depends}, ${cli:Depends}, ${misc:Depends}, libsqlite3-0, libmono0
+Depends: ${shlibs:Depends}, ${cli:Depends}, ${misc:Depends}, libsqlite3-0 (>= 3.2), libmono0
Recommends: gstreamer0.8-lame, gstreamer0.8-flac, gstreamer0.8-faad, gstreamer0.8-faac, gstreamer0.8-vorbis, gstreamer0.8-mad
Description: Audio Managment and Playback application
Banshee is an audio management and playback application for the GNOME
Deleted: non-group/banshee/trunk/debian/patches/01_fix-dllmaps.diff
===================================================================
--- non-group/banshee/trunk/debian/patches/01_fix-dllmaps.diff 2006-02-13 09:34:27 UTC (rev 2249)
+++ non-group/banshee/trunk/debian/patches/01_fix-dllmaps.diff 2006-02-13 10:42:18 UTC (rev 2250)
@@ -1,9 +0,0 @@
---- src/banshee.exe.config.in.old 2005-09-10 18:29:59.092376736 +0200
-+++ src/banshee.exe.config.in 2005-09-10 18:30:16.089792736 +0200
-@@ -4,4 +4,6 @@
- <dllmap dll="libbonobo-2.so" target="libbonobo-2.so.0" />
- <dllmap dll="gdk-x11-2.0" target="libgdk-x11-2.0.so.0" />
- <dllmap dll="libbanshee" target="@expanded_libdir@/@PACKAGE@/libbanshee.so" />
-+ <dllmap dll="libX11" target="libX11.so.6" />
-+ <dllmap dll="libc" target="libc.so.6" />
- </configuration>
Deleted: non-group/banshee/trunk/debian/patches/02_dbus0.6.diff
===================================================================
--- non-group/banshee/trunk/debian/patches/02_dbus0.6.diff 2006-02-13 09:34:27 UTC (rev 2249)
+++ non-group/banshee/trunk/debian/patches/02_dbus0.6.diff 2006-02-13 10:42:18 UTC (rev 2250)
@@ -1,22 +0,0 @@
---- hal-sharp/hal-sharp.dll.config.in.old 2005-12-25 14:28:57.009994296 +0100
-+++ hal-sharp/hal-sharp.dll.config.in 2005-12-25 14:29:05.442712328 +0100
-@@ -1,6 +1,6 @@
- <configuration>
-- <dllmap dll="libdbus-1" target="libdbus-1.so.1" />
-- <dllmap dll="libdbus-glib-1" target="libdbus-glib-1.so.1" />
-+ <dllmap dll="libdbus-1" target="libdbus-1.so.2" />
-+ <dllmap dll="libdbus-glib-1" target="libdbus-glib-1.so.2" />
- <dllmap dll="libglib-2.0.so" target="libglib-2.0.so.0" />
- <dllmap dll="libhal" target="libhal.so.1" />
- </configuration>
-
---- src/Banshee.Dap/Ipod/ipod-sharp.dll.config.in.old 2006-01-01 14:30:19.652220000 +0100
-+++ src/Banshee.Dap/Ipod/ipod-sharp.dll.config.in 2006-01-01 14:30:32.377285496 +0100
-@@ -1,6 +1,6 @@
- <configuration>
- <dllmap dll="ipoddevice" target="libipoddevice.so.0.0.0" />
-- <dllmap dll="libdbus-1" target="libdbus-1.so.1" />
-+ <dllmap dll="libdbus-1" target="libdbus-1.so.2" />
- <dllmap dll="libhal" target="libhal.so.1" />
- </configuration>
-
Deleted: non-group/banshee/trunk/debian/patches/06_fix-Encoding-ASCII-null-termination.diff
===================================================================
--- non-group/banshee/trunk/debian/patches/06_fix-Encoding-ASCII-null-termination.diff 2006-02-13 09:34:27 UTC (rev 2249)
+++ non-group/banshee/trunk/debian/patches/06_fix-Encoding-ASCII-null-termination.diff 2006-02-13 10:42:18 UTC (rev 2250)
@@ -1,17 +0,0 @@
-===================================================================
-RCS file: /cvs/gnome/banshee/src/Banshee.Base/Utilities.cs,v
-retrieving revision 1.12
-retrieving revision 1.13
-diff -u -r1.12 -r1.13
---- src/Banshee.Base/Utilities.cs 2006/02/06 21:30:18 1.12
-+++ src/Banshee.Base/Utilities.cs 2006/02/06 23:53:44 1.13
-@@ -137,7 +137,7 @@
-
- public static void SetProcessName(string name)
- {
-- if(prctl(15 /* PR_SET_NAME */, Encoding.ASCII.GetBytes(name), 0, 0, 0) != 0) {
-+ if(prctl(15 /* PR_SET_NAME */, Encoding.ASCII.GetBytes(name + "\0"), 0, 0, 0) != 0) {
- throw new ApplicationException("Error setting process name: " +
- Mono.Unix.Native.Stdlib.GetLastError());
- }
-
Deleted: non-group/banshee/trunk/debian/patches/07_fix-daap-segfault.diff
===================================================================
--- non-group/banshee/trunk/debian/patches/07_fix-daap-segfault.diff 2006-02-13 09:34:27 UTC (rev 2249)
+++ non-group/banshee/trunk/debian/patches/07_fix-daap-segfault.diff 2006-02-13 10:42:18 UTC (rev 2250)
@@ -1,17 +0,0 @@
-===================================================================
-RCS file: /cvs/gnome/banshee/src/Banshee.Plugins/Daap/DaapCore.cs,v
-retrieving revision 1.5
-retrieving revision 1.6
-diff -u -r1.5 -r1.6
---- src/Banshee.Plugins/Daap/DaapCore.cs 2006/01/17 01:14:13 1.5
-+++ src/Banshee.Plugins/Daap/DaapCore.cs 2006/02/07 16:48:26 1.6
-@@ -214,7 +214,7 @@
-
- internal static string ServerName {
- get {
-- return server.Name;
-+ return server != null ? server.Name : null;
- }
-
- set {
-
Deleted: non-group/banshee/trunk/debian/patches/08_notification-area-icon-64bit.diff
===================================================================
--- non-group/banshee/trunk/debian/patches/08_notification-area-icon-64bit.diff 2006-02-13 09:34:27 UTC (rev 2249)
+++ non-group/banshee/trunk/debian/patches/08_notification-area-icon-64bit.diff 2006-02-13 10:42:18 UTC (rev 2250)
@@ -1,861 +0,0 @@
-Index: src/NotificationAreaIcon.cs
-===================================================================
-RCS file: /cvs/gnome/banshee/src/NotificationAreaIcon.cs,v
-retrieving revision 1.19
-retrieving revision 1.20
-diff -u -r1.19 -r1.20
---- src/NotificationAreaIcon.cs 30 Dec 2005 08:32:31 -0000 1.19
-+++ src/NotificationAreaIcon.cs 8 Feb 2006 00:21:35 -0000 1.20
-@@ -42,7 +42,7 @@
- {
- private EventBox traybox;
-
-- private NotificationAreaIcon ticon;
-+ private NotificationArea ticon;
-
- private Menu traymenu;
-
-@@ -58,7 +58,7 @@
-
- public NotificationAreaIconContainer()
- {
-- ticon = new NotificationAreaIcon(Catalog.GetString("Banshee"));
-+ ticon = new NotificationArea(Catalog.GetString("Banshee"));
- CreateMenu();
- Init();
- popup = new TrackInfoPopup();
-Index: src/Banshee.Widgets/NotificationAreaIcon.cs
-===================================================================
-RCS file: /cvs/gnome/banshee/src/Banshee.Widgets/NotificationAreaIcon.cs,v
-retrieving revision 1.4
-retrieving revision 1.5
-diff -u -r1.4 -r1.5
---- src/Banshee.Widgets/NotificationAreaIcon.cs 22 Dec 2005 19:24:12 -0000 1.4
-+++ src/Banshee.Widgets/NotificationAreaIcon.cs 8 Feb 2006 00:21:35 -0000 1.5
-@@ -39,424 +39,437 @@
-
- #pragma warning disable 0169
-
--public class NotificationAreaIcon : Plug
-+namespace Banshee.Widgets
- {
-- private uint stamp;
-- private Orientation orientation;
--
-- private int selection_atom;
-- private int manager_atom;
-- private int system_tray_opcode_atom;
-- private int orientation_atom;
-- private IntPtr manager_window;
-- private FilterFunc filter;
--
-- public NotificationAreaIcon (string name)
-- {
-- Title = name;
-- Init ();
-- }
--
-- public NotificationAreaIcon (string name, Gdk.Screen screen)
-- {
-- Title = name;
-- Screen = screen;
-- Init ();
-- }
--
-- public uint SendMessage (uint timeout, string message)
-- {
-- if (manager_window == IntPtr.Zero) {
-- return 0;
-- }
--
-- SendManagerMessage (SystemTrayMessage.BeginMessage, (IntPtr) Id, timeout, (uint) message.Length, ++stamp);
--
-- gdk_error_trap_push ();
--
-- for (int index = 0; index < message.Length; index += 20) {
-- XClientMessageEvent ev = new XClientMessageEvent ();
--
-- IntPtr display = gdk_x11_display_get_xdisplay (Display.Handle);
--
-- ev.type = XEventName.ClientMessage;
-- ev.window = (IntPtr) Id;
-- ev.format = 8;
-- ev.message_type = (IntPtr) XInternAtom (display, "_NET_SYSTEM_TRAY_MESSAGE_DATA", false);
-+ public class NotificationArea : Plug
-+ {
-+ private uint stamp;
-+ private Orientation orientation;
-+
-+ private IntPtr selection_atom;
-+ private IntPtr manager_atom;
-+ private IntPtr system_tray_opcode_atom;
-+ private IntPtr orientation_atom;
-+ private IntPtr message_data_atom;
-+ private IntPtr manager_window;
-+ private FilterFunc filter;
-+
-+ public NotificationArea (string name)
-+ {
-+ Title = name;
-+ Init ();
-+ }
-+
-+ public NotificationArea (string name, Gdk.Screen screen)
-+ {
-+ Title = name;
-+ Screen = screen;
-+ Init ();
-+ }
-+
-+ [DllImport ("libc")]
-+ private static extern IntPtr memcpy (ref XClientMessageEvent.DataUnion dest, IntPtr src, IntPtr len);
-+
-+ public uint SendMessage (uint timeout, string message)
-+ {
-+ if (manager_window == IntPtr.Zero) {
-+ return 0;
-+ }
-+
-+ byte[] arr = System.Text.Encoding.UTF8.GetBytes (message);
-+ IntPtr unmanaged_arr = Marshal.AllocHGlobal (arr.Length);
-+ Marshal.Copy (arr, 0, unmanaged_arr, arr.Length);
-+
-+ SendManagerMessage (SystemTrayMessage.BeginMessage, (IntPtr) Id, timeout, (uint) arr.Length, ++stamp);
-+
-+ gdk_error_trap_push ();
-+
-+ for (int index = 0; index < message.Length; index += 20) {
-+ XClientMessageEvent ev = new XClientMessageEvent ();
-+
-+ IntPtr display = gdk_x11_display_get_xdisplay (Display.Handle);
-+
-+ ev.type = XEventName.ClientMessage;
-+ ev.window = (IntPtr) Id;
-+ ev.format = 8;
-+ ev.message_type = message_data_atom;
-
-- byte [] arr = System.Text.Encoding.UTF8.GetBytes (message.Substring (index));
-- int len = Math.Min (arr.Length, 20);
-- Marshal.Copy (arr, 0, ev.data.ptr1, len);
--
-- XSendEvent (display, manager_window, false, EventMask.StructureNotifyMask, ref ev);
-- XSync (display, false);
-- }
-+ int len = Math.Min (arr.Length - index, 20);
-+ memcpy (ref ev.data, (IntPtr)((int)unmanaged_arr + index), (IntPtr)len);
-+
-+ XSendEvent (display, manager_window, false, (IntPtr) EventMask.StructureNotifyMask, ref ev);
-+ XSync (display, false);
-+ }
-+
-+ gdk_error_trap_pop ();
-+
-+ return stamp;
-+ }
-+
-+ public void CancelMessage (uint id)
-+ {
-+ if (id == 0) {
-+ return;
-+ }
-+
-+ SendManagerMessage (SystemTrayMessage.CancelMessage, (IntPtr) Id, id, 0, 0);
-+ }
-+
-+ private void Init ()
-+ {
-+ stamp = 1;
-+ orientation = Orientation.Horizontal;
-+ AddEvents ((int)EventMask.PropertyChangeMask);
-+ filter = new FilterFunc (ManagerFilter);
-+ }
-+
-+ protected override void OnRealized ()
-+ {
-+ base.OnRealized ();
-+ Display display = Screen.Display;
-+ IntPtr xdisplay = gdk_x11_display_get_xdisplay (display.Handle);
-+ selection_atom = XInternAtom (xdisplay, "_NET_SYSTEM_TRAY_S" + Screen.Number.ToString (), false);
-+ manager_atom = XInternAtom (xdisplay, "MANAGER", false);
-+ system_tray_opcode_atom = XInternAtom (xdisplay, "_NET_SYSTEM_TRAY_OPCODE", false);
-+ orientation_atom = XInternAtom (xdisplay, "_NET_SYSTEM_TRAY_ORIENTATION", false);
-+ message_data_atom = XInternAtom (xdisplay, "_NET_SYSTEM_TRAY_MESSAGE_DATA", false);
-+ UpdateManagerWindow (false);
-+ SendDockRequest ();
-+ Screen.RootWindow.AddFilter (filter);
-+ }
-+
-+ protected override void OnUnrealized ()
-+ {
-+ if (manager_window != IntPtr.Zero) {
-+ Gdk.Window gdkwin = Gdk.Window.ForeignNewForDisplay (Display, (uint)manager_window);
-+ if (gdkwin != null) {
-+ gdkwin.RemoveFilter (filter);
-+ }
-+ }
-+
-+ Screen.RootWindow.RemoveFilter (filter);
-+ base.OnUnrealized ();
-+ }
-+
-+ private void UpdateManagerWindow (bool dock_if_realized)
-+ {
-+ IntPtr xdisplay = gdk_x11_display_get_xdisplay (Display.Handle);
-+
-+ if (manager_window != IntPtr.Zero) {
-+ return;
-+ }
-+
-+ XGrabServer (xdisplay);
-+
-+ manager_window = XGetSelectionOwner (xdisplay, selection_atom);
-+ if (manager_window != IntPtr.Zero) {
-+ XSelectInput (xdisplay, manager_window, (IntPtr) (EventMask.StructureNotifyMask | EventMask.PropertyChangeMask));
-+ }
-+
-+ XUngrabServer (xdisplay);
-+ XFlush (xdisplay);
-+
-+ if (manager_window != IntPtr.Zero) {
-+ Gdk.Window gdkwin = Gdk.Window.ForeignNewForDisplay (Display, (uint)manager_window);
-+ if (gdkwin != null) {
-+ gdkwin.AddFilter (filter);
-+ }
-+
-+ if (dock_if_realized && IsRealized) {
-+ SendDockRequest ();
-+ }
-+
-+ GetOrientationProperty ();
-+ }
-+ }
-+
-+ private void SendDockRequest ()
-+ {
-+ SendManagerMessage (SystemTrayMessage.RequestDock, manager_window, Id, 0, 0);
-+ }
-+
-+ private void SendManagerMessage (SystemTrayMessage message, IntPtr window, uint data1, uint data2, uint data3)
-+ {
-+ XClientMessageEvent ev = new XClientMessageEvent ();
-+ IntPtr display;
-+
-+ ev.type = XEventName.ClientMessage;
-+ ev.window = window;
-+ ev.message_type = system_tray_opcode_atom;
-+ ev.format = 32;
-+ ev.data.ptr1 = (IntPtr)gdk_x11_get_server_time (GdkWindow.Handle);
-+ ev.data.ptr2 = (IntPtr)message;
-+ ev.data.ptr3 = (IntPtr)data1;
-+ ev.data.ptr4 = (IntPtr)data2;
-+ ev.data.ptr5 = (IntPtr)data3;
-+
-+ display = gdk_x11_display_get_xdisplay (Display.Handle);
-+ gdk_error_trap_push ();
-+ XSendEvent (display, manager_window, false, (IntPtr) EventMask.NoEventMask, ref ev);
-+ XSync (display, false);
-+ gdk_error_trap_pop ();
-+ }
-+
-+ private FilterReturn ManagerFilter (IntPtr xevent, Event evnt)
-+ {
-+ XAnyEvent xev = (XAnyEvent) Marshal.PtrToStructure (xevent, typeof(XAnyEvent));
-
-- gdk_error_trap_pop ();
-+ if (xev.type == XEventName.ClientMessage){
-+ XClientMessageEvent xclient = (XClientMessageEvent) Marshal.PtrToStructure (xevent, typeof(XClientMessageEvent));
-
-- return stamp;
-- }
-+ if (xclient.message_type == manager_atom && xclient.data.ptr2 == selection_atom) {
-+ UpdateManagerWindow (true);
-+ return FilterReturn.Continue;
-+ }
-+ }
-
-- public void CancelMessage (uint id)
-- {
-- if (id == 0) {
-- return;
-- }
--
-- SendManagerMessage (SystemTrayMessage.CancelMessage, (IntPtr) Id, id, 0, 0);
-- }
--
-- private void Init ()
-- {
-- stamp = 1;
-- orientation = Orientation.Horizontal;
-- AddEvents ((int)EventMask.PropertyChangeMask);
-- filter = new FilterFunc (ManagerFilter);
-- }
--
-- protected override void OnRealized ()
-- {
-- base.OnRealized ();
-- Display display = Screen.Display;
-- IntPtr xdisplay = gdk_x11_display_get_xdisplay (display.Handle);
-- selection_atom = XInternAtom (xdisplay, "_NET_SYSTEM_TRAY_S" + Screen.Number.ToString (), false);
-- manager_atom = XInternAtom (xdisplay, "MANAGER", false);
-- system_tray_opcode_atom = XInternAtom (xdisplay, "_NET_SYSTEM_TRAY_OPCODE", false);
-- orientation_atom = XInternAtom (xdisplay, "_NET_SYSTEM_TRAY_ORIENTATION", false);
-- UpdateManagerWindow (false);
-- SendDockRequest ();
-- Screen.RootWindow.AddFilter (filter);
-- }
--
-- protected override void OnUnrealized ()
-- {
-- if (manager_window != IntPtr.Zero) {
-- Gdk.Window gdkwin = Gdk.Window.ForeignNewForDisplay (Display, (uint)manager_window);
-- if (gdkwin != null) {
-- gdkwin.RemoveFilter (filter);
-- }
-- }
--
-- Screen.RootWindow.RemoveFilter (filter);
-- base.OnUnrealized ();
-- }
--
-- private void UpdateManagerWindow (bool dock_if_realized)
-- {
-- IntPtr xdisplay = gdk_x11_display_get_xdisplay (Display.Handle);
--
-- if (manager_window != IntPtr.Zero) {
-- return;
-- }
--
-- XGrabServer (xdisplay);
-+ if (xev.window == manager_window) {
-+ if (xev.type == XEventName.PropertyNotify){
-+ XPropertyEvent xproperty = (XPropertyEvent) Marshal.PtrToStructure (xevent, typeof(XPropertyEvent));
-+ if (xproperty.atom == orientation_atom) {
-+ GetOrientationProperty();
-+ return FilterReturn.Continue;
-+ }
-+ }
-
-- manager_window = XGetSelectionOwner (xdisplay, selection_atom);
-- if (manager_window != IntPtr.Zero) {
-- XSelectInput (xdisplay, manager_window, EventMask.StructureNotifyMask | EventMask.PropertyChangeMask);
-- }
-+ if (xev.type == XEventName.DestroyNotify) {
-+ ManagerWindowDestroyed();
-+ }
-+ }
-
-- XUngrabServer (xdisplay);
-- XFlush (xdisplay);
-+ return FilterReturn.Continue;
-+ }
-
-- if (manager_window != IntPtr.Zero) {
-- Gdk.Window gdkwin = Gdk.Window.ForeignNewForDisplay (Display, (uint)manager_window);
-- if (gdkwin != null) {
-- gdkwin.AddFilter (filter);
-- }
-+ private void ManagerWindowDestroyed ()
-+ {
-+ if (manager_window != IntPtr.Zero) {
-+ Gdk.Window gdkwin = Gdk.Window.ForeignNewForDisplay (Display, (uint) manager_window);
-
-- if (dock_if_realized && IsRealized) {
-- SendDockRequest ();
-- }
-+ if (gdkwin != null) {
-+ gdkwin.RemoveFilter (filter);
-+ }
-
-- GetOrientationProperty ();
-- }
-- }
--
-- private void SendDockRequest ()
-- {
-- SendManagerMessage (SystemTrayMessage.RequestDock, manager_window, Id, 0, 0);
-- }
--
-- private void SendManagerMessage (SystemTrayMessage message, IntPtr window, uint data1, uint data2, uint data3)
-- {
-- XClientMessageEvent ev = new XClientMessageEvent ();
-- IntPtr display;
--
-- ev.type = XEventName.ClientMessage;
-- ev.window = window;
-- ev.message_type = (IntPtr)system_tray_opcode_atom;
-- ev.format = 32;
-- ev.data.ptr1 = gdk_x11_get_server_time (GdkWindow.Handle);
-- ev.data.ptr2 = (IntPtr)message;
-- ev.data.ptr3 = (IntPtr)data1;
-- ev.data.ptr4 = (IntPtr)data2;
-- ev.data.ptr5 = (IntPtr)data3;
--
-- display = gdk_x11_display_get_xdisplay (Display.Handle);
-- gdk_error_trap_push ();
-- XSendEvent (display, manager_window, false, EventMask.NoEventMask, ref ev);
-- XSync (display, false);
-- gdk_error_trap_pop ();
-- }
--
-- private FilterReturn ManagerFilter (IntPtr xevent, Event evnt)
-- {
-- XAnyEvent xev = (XAnyEvent) Marshal.PtrToStructure (xevent, typeof(XAnyEvent));
--
-- if (xev.type == XEventName.ClientMessage){
-- XClientMessageEvent xclient = (XClientMessageEvent) Marshal.PtrToStructure (xevent, typeof(XClientMessageEvent));
--
-- if ((int) xclient.message_type == manager_atom && (int) xclient.data.ptr2 == selection_atom) {
-+ manager_window = IntPtr.Zero;
- UpdateManagerWindow (true);
-- return FilterReturn.Continue;
- }
- }
-
-- if (xev.window == manager_window) {
-- if (xev.type == XEventName.PropertyNotify){
-- XPropertyEvent xproperty = (XPropertyEvent) Marshal.PtrToStructure (xevent, typeof(XPropertyEvent));
-- if (xproperty.atom == orientation_atom) {
-- GetOrientationProperty();
-- return FilterReturn.Continue;
-- }
-- }
--
-- if (xev.type == XEventName.DestroyNotify) {
-- ManagerWindowDestroyed();
-- }
-- }
--
-- return FilterReturn.Continue;
-- }
-+ private void GetOrientationProperty ()
-+ {
-+ IntPtr display;
-+ IntPtr type;
-+ int format;
-+ IntPtr prop_return;
-+ IntPtr nitems, bytes_after;
-+ int error, result;
-
-- private void ManagerWindowDestroyed ()
-- {
-- if (manager_window != IntPtr.Zero) {
-- Gdk.Window gdkwin = Gdk.Window.ForeignNewForDisplay (Display, (uint) manager_window);
--
-- if (gdkwin != null) {
-- gdkwin.RemoveFilter (filter);
-- }
--
-- manager_window = IntPtr.Zero;
-- UpdateManagerWindow (true);
-- }
-- }
--
-- private void GetOrientationProperty ()
-- {
-- IntPtr display;
-- int type;
-- int format;
-- IntPtr prop_return;
-- IntPtr nitems, bytes_after;
-- int error, result;
--
-- if (manager_window == IntPtr.Zero) {
-- return;
-- }
-+ if (manager_window == IntPtr.Zero) {
-+ return;
-+ }
-
-- display = gdk_x11_display_get_xdisplay (Display.Handle);
-+ display = gdk_x11_display_get_xdisplay (Display.Handle);
-
-- gdk_error_trap_push ();
-- type = 0;
-+ gdk_error_trap_push ();
-+ type = IntPtr.Zero;
-
-- result = XGetWindowProperty (display, manager_window, orientation_atom, (IntPtr) 0,
-- (IntPtr) System.Int32.MaxValue, false, (int) XAtom.Cardinal, out type, out format,
-- out nitems, out bytes_after, out prop_return);
-+ result = XGetWindowProperty (display, manager_window, orientation_atom, (IntPtr) 0,
-+ (IntPtr) System.Int32.MaxValue, false, (IntPtr) XAtom.Cardinal, out type, out format,
-+ out nitems, out bytes_after, out prop_return);
-
-- error = gdk_error_trap_pop ();
-+ error = gdk_error_trap_pop ();
-
-- if (error != 0 || result != 0) {
-- return;
-- }
--
-- if (type == (int) XAtom.Cardinal) {
-- orientation = ((SystemTrayOrientation) Marshal.ReadInt32 (prop_return) == SystemTrayOrientation.Horz)
-- ? Orientation.Horizontal
-- : Orientation.Vertical;
-- }
--
-- if (prop_return != IntPtr.Zero) {
-- XFree (prop_return);
-- }
-- }
-+ if (error != 0 || result != 0) {
-+ return;
-+ }
-
-- [DllImport ("gdk-x11-2.0")]
-- private static extern IntPtr gdk_x11_display_get_xdisplay (IntPtr display);
--
-- [DllImport ("gdk-x11-2.0")]
-- private static extern IntPtr gdk_x11_get_server_time (IntPtr window);
--
-- [DllImport ("gdk-x11-2.0")]
-- private static extern void gdk_error_trap_push ();
--
-- [DllImport ("gdk-x11-2.0")]
-- private static extern int gdk_error_trap_pop ();
--
-- [DllImport ("libX11", EntryPoint="XInternAtom")]
-- private extern static int XInternAtom(IntPtr display, string atom_name, bool only_if_exists);
--
-- [DllImport ("libX11")]
-- private extern static void XGrabServer (IntPtr display);
--
-- [DllImport ("libX11")]
-- private extern static void XUngrabServer (IntPtr display);
--
-- [DllImport ("libX11")]
-- private extern static int XFlush (IntPtr display);
--
-- [DllImport ("libX11")]
-- private extern static int XSync (IntPtr display, bool discard);
--
-- [DllImport ("libX11")]
-- private extern static int XFree (IntPtr display);
-+ if (type == (IntPtr) XAtom.Cardinal) {
-+ orientation = ((SystemTrayOrientation) Marshal.ReadInt32 (prop_return) == SystemTrayOrientation.Horz)
-+ ? Orientation.Horizontal
-+ : Orientation.Vertical;
-+ }
-+
-+ if (prop_return != IntPtr.Zero) {
-+ XFree (prop_return);
-+ }
-+ }
-+
-+ [DllImport ("libgdk-x11-2.0.so.0")]
-+ private static extern IntPtr gdk_x11_display_get_xdisplay (IntPtr display);
-
-- [DllImport ("libX11")]
-- private extern static IntPtr XGetSelectionOwner (IntPtr display, int atom);
-+ [DllImport ("libgdk-x11-2.0.so.0")]
-+ private static extern int gdk_x11_get_server_time (IntPtr window);
-
-- [DllImport ("libX11")]
-- private extern static IntPtr XSelectInput (IntPtr window, IntPtr display, EventMask mask);
-+ [DllImport ("libgdk-x11-2.0.so.0")]
-+ private static extern void gdk_error_trap_push ();
-
-- [DllImport ("libX11", EntryPoint="XSendEvent")]
-- private extern static int XSendEvent(IntPtr display, IntPtr window, bool propagate, EventMask event_mask,
-- ref XClientMessageEvent send_event);
--
-- [DllImport("libX11")]
-- private extern static int XGetWindowProperty(IntPtr display, IntPtr w, int property, IntPtr long_offset,
-- IntPtr long_length, bool deleteProp, int req_type, out int actual_type_return, out int actual_format_return,
-- out IntPtr nitems_return, out IntPtr bytes_after_return, out IntPtr prop_return);
--
-- [Flags]
-- private enum EventMask {
-- NoEventMask = 0,
-- KeyPressMask = 1 << 0,
-- KeyReleaseMask = 1 << 1,
-- ButtonPressMask = 1 << 2,
-- ButtonReleaseMask = 1 << 3,
-- EnterWindowMask = 1 << 4,
-- LeaveWindowMask = 1 << 5,
-- PointerMotionMask = 1 << 6,
-- PointerMotionHintMask = 1 << 7,
-- Button1MotionMask = 1 << 8,
-- Button2MotionMask = 1 << 9,
-- Button3MotionMask = 1 << 10,
-- Button4MotionMask = 1 << 11,
-- Button5MotionMask = 1 << 12,
-- ButtonMotionMask = 1 << 13,
-- KeymapStateMask = 1 << 14,
-- ExposureMask = 1 << 15,
-- VisibilityChangeMask = 1 << 16,
-- StructureNotifyMask = 1 << 17,
-- ResizeRedirectMask = 1 << 18,
-- SubstructureNotifyMask = 1 << 19,
-- SubstructureRedirectMask = 1 << 20,
-- FocusChangeMask = 1 << 21,
-- PropertyChangeMask = 1 << 22,
-- ColormapChangeMask = 1 << 23,
-- OwnerGrabButtonMask = 1 << 24
-- }
--
-- private enum SystemTrayMessage {
-- RequestDock = 0,
-- BeginMessage = 1,
-- CancelMessage = 2
-- }
--
-- private enum SystemTrayOrientation {
-- Horz = 0,
-- Vert = 1
-- }
--
-- private enum XEventName {
-- KeyPress = 2,
-- KeyRelease = 3,
-- ButtonPress = 4,
-- ButtonRelease = 5,
-- MotionNotify = 6,
-- EnterNotify = 7,
-- LeaveNotify = 8,
-- FocusIn = 9,
-- FocusOut = 10,
-- KeymapNotify = 11,
-- Expose = 12,
-- GraphicsExpose = 13,
-- NoExpose = 14,
-- VisibilityNotify = 15,
-- CreateNotify = 16,
-- DestroyNotify = 17,
-- UnmapNotify = 18,
-- MapNotify = 19,
-- MapRequest = 20,
-- ReparentNotify = 21,
-- ConfigureNotify = 22,
-- ConfigureRequest = 23,
-- GravityNotify = 24,
-- ResizeRequest = 25,
-- CirculateNotify = 26,
-- CirculateRequest = 27,
-- PropertyNotify = 28,
-- SelectionClear = 29,
-- SelectionRequest = 30,
-- SelectionNotify = 31,
-- ColormapNotify = 32,
-- ClientMessage = 33,
-- MappingNotify = 34,
-- TimerNotify = 100,
-- LASTEvent
-- }
--
-- private enum XAtom {
-- Cardinal = 6,
-- LASTAtom
-- }
-+ [DllImport ("libgdk-x11-2.0.so.0")]
-+ private static extern int gdk_error_trap_pop ();
-+
-+ [DllImport ("libX11")]
-+ private extern static IntPtr XInternAtom(IntPtr display, string atom_name, bool only_if_exists);
-+
-+ [DllImport ("libX11")]
-+ private extern static void XGrabServer (IntPtr display);
-+
-+ [DllImport ("libX11")]
-+ private extern static void XUngrabServer (IntPtr display);
-+
-+ [DllImport ("libX11")]
-+ private extern static int XFlush (IntPtr display);
-+
-+ [DllImport ("libX11")]
-+ private extern static int XSync (IntPtr display, bool discard);
-+
-+ [DllImport ("libX11")]
-+ private extern static int XFree (IntPtr display);
-+
-+ [DllImport ("libX11")]
-+ private extern static IntPtr XGetSelectionOwner (IntPtr display, IntPtr atom);
-+
-+ [DllImport ("libX11")]
-+ private extern static IntPtr XSelectInput (IntPtr display, IntPtr window, IntPtr mask);
-+
-+ [DllImport ("libX11")]
-+ private extern static int XSendEvent(IntPtr display, IntPtr window, bool propagate, IntPtr event_mask,
-+ ref XClientMessageEvent send_event);
-+
-+ [DllImport("libX11")]
-+ private extern static int XGetWindowProperty(IntPtr display, IntPtr w, IntPtr property, IntPtr long_offset,
-+ IntPtr long_length, bool deleteProp, IntPtr req_type,
-+ out IntPtr actual_type_return, out int actual_format_return,
-+ out IntPtr nitems_return, out IntPtr bytes_after_return,
-+ out IntPtr prop_return);
-+
-+ [Flags]
-+ private enum EventMask {
-+ NoEventMask = 0,
-+ KeyPressMask = 1 << 0,
-+ KeyReleaseMask = 1 << 1,
-+ ButtonPressMask = 1 << 2,
-+ ButtonReleaseMask = 1 << 3,
-+ EnterWindowMask = 1 << 4,
-+ LeaveWindowMask = 1 << 5,
-+ PointerMotionMask = 1 << 6,
-+ PointerMotionHintMask = 1 << 7,
-+ Button1MotionMask = 1 << 8,
-+ Button2MotionMask = 1 << 9,
-+ Button3MotionMask = 1 << 10,
-+ Button4MotionMask = 1 << 11,
-+ Button5MotionMask = 1 << 12,
-+ ButtonMotionMask = 1 << 13,
-+ KeymapStateMask = 1 << 14,
-+ ExposureMask = 1 << 15,
-+ VisibilityChangeMask = 1 << 16,
-+ StructureNotifyMask = 1 << 17,
-+ ResizeRedirectMask = 1 << 18,
-+ SubstructureNotifyMask = 1 << 19,
-+ SubstructureRedirectMask = 1 << 20,
-+ FocusChangeMask = 1 << 21,
-+ PropertyChangeMask = 1 << 22,
-+ ColormapChangeMask = 1 << 23,
-+ OwnerGrabButtonMask = 1 << 24
-+ }
-+
-+ private enum SystemTrayMessage {
-+ RequestDock = 0,
-+ BeginMessage = 1,
-+ CancelMessage = 2
-+ }
-+
-+ private enum SystemTrayOrientation {
-+ Horz = 0,
-+ Vert = 1
-+ }
-+
-+ private enum XEventName {
-+ KeyPress = 2,
-+ KeyRelease = 3,
-+ ButtonPress = 4,
-+ ButtonRelease = 5,
-+ MotionNotify = 6,
-+ EnterNotify = 7,
-+ LeaveNotify = 8,
-+ FocusIn = 9,
-+ FocusOut = 10,
-+ KeymapNotify = 11,
-+ Expose = 12,
-+ GraphicsExpose = 13,
-+ NoExpose = 14,
-+ VisibilityNotify = 15,
-+ CreateNotify = 16,
-+ DestroyNotify = 17,
-+ UnmapNotify = 18,
-+ MapNotify = 19,
-+ MapRequest = 20,
-+ ReparentNotify = 21,
-+ ConfigureNotify = 22,
-+ ConfigureRequest = 23,
-+ GravityNotify = 24,
-+ ResizeRequest = 25,
-+ CirculateNotify = 26,
-+ CirculateRequest = 27,
-+ PropertyNotify = 28,
-+ SelectionClear = 29,
-+ SelectionRequest = 30,
-+ SelectionNotify = 31,
-+ ColormapNotify = 32,
-+ ClientMessage = 33,
-+ MappingNotify = 34,
-+ TimerNotify = 100,
-+ LASTEvent
-+ }
-+
-+ private enum XAtom {
-+ Cardinal = 6,
-+ LASTAtom
-+ }
-
-- [StructLayout(LayoutKind.Sequential)]
-- private struct XAnyEvent
-- {
-- internal XEventName type;
-- internal IntPtr serial;
-- internal bool send_event;
-- internal IntPtr display;
-- internal IntPtr window;
-- }
-+ [StructLayout(LayoutKind.Sequential)]
-+ private struct XAnyEvent
-+ {
-+ internal XEventName type;
-+ internal IntPtr serial;
-+ internal bool send_event;
-+ internal IntPtr display;
-+ internal IntPtr window;
-+ }
-
-- [StructLayout(LayoutKind.Sequential)]
-- private struct XPropertyEvent
-- {
-- internal XEventName type;
-- internal IntPtr serial;
-- internal bool send_event;
-- internal IntPtr display;
-- internal IntPtr window;
-- internal int atom;
-- internal IntPtr time;
-- internal int state;
-- }
-+ [StructLayout(LayoutKind.Sequential)]
-+ private struct XPropertyEvent
-+ {
-+ internal XEventName type;
-+ internal IntPtr serial;
-+ internal bool send_event;
-+ internal IntPtr display;
-+ internal IntPtr window;
-+ internal IntPtr atom;
-+ internal IntPtr time;
-+ internal int state;
-+ }
-
-- [StructLayout(LayoutKind.Sequential)]
-- private struct XClientMessageEvent
-- {
-- internal XEventName type;
-- internal IntPtr serial;
-- internal bool send_event;
-- internal IntPtr display;
-- internal IntPtr window;
-- internal IntPtr message_type;
-- internal int format;
-+ [StructLayout(LayoutKind.Sequential)]
-+ private struct XClientMessageEvent
-+ {
-+ internal XEventName type;
-+ internal IntPtr serial;
-+ internal bool send_event;
-+ internal IntPtr display;
-+ internal IntPtr window;
-+ internal IntPtr message_type;
-+ internal int format;
-
-- [StructLayout(LayoutKind.Explicit)]
-- internal struct DataUnion
-- {
-- [FieldOffset(0)] internal IntPtr ptr1;
-- [FieldOffset(4)] internal IntPtr ptr2;
-- [FieldOffset(8)] internal IntPtr ptr3;
-- [FieldOffset(12)] internal IntPtr ptr4;
-- [FieldOffset(16)] internal IntPtr ptr5;
-- }
-+ [StructLayout(LayoutKind.Sequential)]
-+ internal struct DataUnion
-+ {
-+ internal IntPtr ptr1;
-+ internal IntPtr ptr2;
-+ internal IntPtr ptr3;
-+ internal IntPtr ptr4;
-+ internal IntPtr ptr5;
-+ }
-
-- internal DataUnion data;
-+ internal DataUnion data;
-+ }
- }
- }
-
More information about the Pkg-mono-svn-commits
mailing list