Hello community,
here is the log from the commit of package gnome-do for openSUSE:Factory
checked in at Fri Dec 11 16:20:28 CET 2009.
--------
--- GNOME/gnome-do/gnome-do.changes 2009-10-22 12:24:05.000000000 +0200
+++ gnome-do/gnome-do.changes 2009-12-08 14:07:17.000000000 +0100
@@ -1,0 +2,8 @@
+Tue Dec 8 09:41:05 CET 2009 - dimstar@opensuse.org
+
+- Update to version 0.8.3:
+ + A purely bugfix release
+ + A multitude of crash bugs have been fixed
+ + lp#395190, bnc#540518 - fixes the persistant "100% CPU" bug.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
gnome-do-0.8.2.tar.bz2
New:
----
gnome-do-0.8.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-do.spec ++++++
--- /var/tmp/diff_new_pack.1Qf93E/_old 2009-12-11 16:19:44.000000000 +0100
+++ /var/tmp/diff_new_pack.1Qf93E/_new 2009-12-11 16:19:44.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package gnome-do (Version 0.8.2)
+# spec file for package gnome-do (Version 0.8.3)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,9 +19,9 @@
Name: gnome-do
-Version: 0.8.2
-Release: 3
-License: GPL v3 or later
+Version: 0.8.3
+Release: 1
+License: GPLv3+
Url: http://do.davebsd.com/
Source: %{name}-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM gnome-do-OnlyShowIn.patch lp#413575 dominique-obs@leuenberger.net -- Show gnome-do only in gnome desktop.
++++++ gnome-do-0.8.2.tar.bz2 -> gnome-do-0.8.3.tar.bz2 ++++++
++++ 23782 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-do-0.8.2/Do/gnome-do.in new/gnome-do-0.8.3/Do/gnome-do.in
--- old/gnome-do-0.8.2/Do/gnome-do.in 2009-06-26 05:39:51.000000000 +0200
+++ new/gnome-do-0.8.3/Do/gnome-do.in 2009-12-08 06:21:50.000000000 +0100
@@ -17,7 +17,7 @@
'/org/gnome/Do/Controller' 'org.gnome.Do.Controller.Summon'
# If Do is not running, run it.
-if pgrep -u "`id -un`" '^gnome-do$' >/dev/null; then
+if pgrep -u "`id -u`" '^gnome-do$' >/dev/null; then
mono "$GNOME_DO_EXE" "$@"
fi
while [ "$?" -eq "20" ]; do
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-do-0.8.2/Do/src/AssemblyInfo.cs new/gnome-do-0.8.3/Do/src/AssemblyInfo.cs
--- old/gnome-do-0.8.2/Do/src/AssemblyInfo.cs 2009-06-26 07:48:29.000000000 +0200
+++ new/gnome-do-0.8.3/Do/src/AssemblyInfo.cs 2009-12-08 06:33:47.000000000 +0100
@@ -52,9 +52,9 @@
{
internal static class AssemblyInfo
{
- public const string DisplayVersion = "0.8.2";
- public const string VersionDetails = "bzr trunk r1261";
- public const string LocaleDirectory = "/usr/local/share/locale";
+ public const string DisplayVersion = "0.8.3";
+ public const string VersionDetails = "bzr core-0.8.2 r1278";
+ public const string LocaleDirectory = "/home/raof/.local/share/locale";
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-do-0.8.2/Do/src/Do.UI/ColorConfigurationWidget.cs new/gnome-do-0.8.3/Do/src/Do.UI/ColorConfigurationWidget.cs
--- old/gnome-do-0.8.2/Do/src/Do.UI/ColorConfigurationWidget.cs 2009-06-26 05:39:51.000000000 +0200
+++ new/gnome-do-0.8.3/Do/src/Do.UI/ColorConfigurationWidget.cs 2009-12-08 06:26:40.000000000 +0100
@@ -78,7 +78,10 @@
protected virtual void OnThemeComboChanged (object sender, System.EventArgs e)
{
Do.Preferences.Theme = Themes[theme_combo.Active];
- SetupConfigurationWidget ();
+ GLib.Idle.Add (() => {
+ SetupConfigurationWidget ();
+ return false;
+ });
}
void SetupConfigurationWidget ()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-do-0.8.2/Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/Bezel.cs new/gnome-do-0.8.3/Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/Bezel.cs
--- old/gnome-do-0.8.2/Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/Bezel.cs 2009-06-26 05:39:51.000000000 +0200
+++ new/gnome-do-0.8.3/Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/Bezel.cs 2009-12-08 06:27:44.000000000 +0100
@@ -80,6 +80,13 @@
Add (bezel_drawing_area);
pw = new PositionWindow (this, bezel_glass_window);
+
+ Realized += delegate { GdkWindow.SetBackPixmap (null, false); };
+
+ StyleSet += delegate {
+ if (IsRealized)
+ GdkWindow.SetBackPixmap (null, false);
+ };
}
protected override void OnDestroyed ()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-do-0.8.2/Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelGlassWindow.cs new/gnome-do-0.8.3/Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelGlassWindow.cs
--- old/gnome-do-0.8.2/Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelGlassWindow.cs 2009-06-26 05:39:51.000000000 +0200
+++ new/gnome-do-0.8.3/Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelGlassWindow.cs 2009-12-08 06:27:44.000000000 +0100
@@ -32,7 +32,7 @@
public class BezelGlassWindow : Gtk.Window
{
- public BezelGlassWindow(BezelGlassResults results) : base (Gtk.WindowType.Toplevel)
+ public BezelGlassWindow (BezelGlassResults results) : base(Gtk.WindowType.Toplevel)
{
Decorated = false;
AppPaintable = true;
@@ -44,6 +44,13 @@
Add (results);
results.Show ();
+
+ Realized += delegate { GdkWindow.SetBackPixmap (null, false); };
+
+ StyleSet += delegate {
+ if (IsRealized)
+ GdkWindow.SetBackPixmap (null, false);
+ };
}
protected override bool OnExposeEvent (EventExpose evnt)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-do-0.8.2/Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelResultsDrawingArea.cs new/gnome-do-0.8.3/Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelResultsDrawingArea.cs
--- old/gnome-do-0.8.2/Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelResultsDrawingArea.cs 2009-06-26 05:39:51.000000000 +0200
+++ new/gnome-do-0.8.3/Do.Interface.Linux.AnimationBase/src/Do.Interface/Do.Interface.AnimationBase/BezelResultsDrawingArea.cs 2009-12-08 06:27:44.000000000 +0100
@@ -134,6 +134,15 @@
even_color = new Cairo.Color (.2, .2, .2, .3);
DoubleBuffered = false;
+
+ Realized += delegate {
+ GdkWindow.SetBackPixmap (null, false);
+ };
+
+ StyleSet += delegate {
+ if (IsRealized)
+ GdkWindow.SetBackPixmap (null, false);
+ };
}
private void AnimatedDraw ()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-do-0.8.2/Do.Interface.Linux.Docky/AssemblyInfo.cs new/gnome-do-0.8.3/Do.Interface.Linux.Docky/AssemblyInfo.cs
--- old/gnome-do-0.8.2/Do.Interface.Linux.Docky/AssemblyInfo.cs 2009-06-26 07:48:30.000000000 +0200
+++ new/gnome-do-0.8.3/Do.Interface.Linux.Docky/AssemblyInfo.cs 2009-12-08 06:33:47.000000000 +0100
@@ -52,9 +52,9 @@
{
internal static class AssemblyInfo
{
- public const string DisplayVersion = "0.8.2";
- public const string VersionDetails = "bzr trunk r1261";
- public const string LocaleDirectory = "/usr/local/share/locale";
+ public const string DisplayVersion = "0.8.3";
+ public const string VersionDetails = "bzr core-0.8.2 r1278";
+ public const string LocaleDirectory = "/home/raof/.local/share/locale";
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-do-0.8.2/Do.Interface.Linux.Docky/src/Docky.Core/Docky.Core.Default/ItemsService.cs new/gnome-do-0.8.3/Do.Interface.Linux.Docky/src/Docky.Core/Docky.Core.Default/ItemsService.cs
--- old/gnome-do-0.8.2/Do.Interface.Linux.Docky/src/Docky.Core/Docky.Core.Default/ItemsService.cs 2009-06-26 05:39:51.000000000 +0200
+++ new/gnome-do-0.8.3/Do.Interface.Linux.Docky/src/Docky.Core/Docky.Core.Default/ItemsService.cs 2009-12-08 06:05:38.000000000 +0100
@@ -165,8 +165,10 @@
Services.Core.UniverseInitialized -= HandleUniverseInitialized;
// wnck events
- Wnck.Screen.Default.WindowClosed -= HandleWindowClosed;
- Wnck.Screen.Default.WindowOpened -= HandleWindowOpened;
+ if (Wnck.Screen.Default != null) {
+ Wnck.Screen.Default.WindowClosed -= HandleWindowClosed;
+ Wnck.Screen.Default.WindowOpened -= HandleWindowOpened;
+ }
// Dock Services
DockPreferences.AutomaticIconsChanged -= HandleAutomaticIconsChanged;
@@ -690,7 +692,7 @@
do {
if (!ItemCanInteractWithPosition (item, position)) continue;
- if (DockItems [position] is TrashDockItem) {
+ if (DockItems [position] is TrashDockItem && !(item is TrashDockItem)) {
RemoveItem (item);
continue;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-do-0.8.2/Do.Interface.Linux.Docky/src/Docky.Interface/AutohideTracker.cs new/gnome-do-0.8.3/Do.Interface.Linux.Docky/src/Docky.Interface/AutohideTracker.cs
--- old/gnome-do-0.8.2/Do.Interface.Linux.Docky/src/Docky.Interface/AutohideTracker.cs 2009-06-26 05:39:51.000000000 +0200
+++ new/gnome-do-0.8.3/Do.Interface.Linux.Docky/src/Docky.Interface/AutohideTracker.cs 2009-12-08 06:13:43.000000000 +0100
@@ -56,6 +56,7 @@
internal AutohideTracker (DockArea parent)
{
this.parent = parent;
+ DockPreferences.IconSizeChanged += HandleIconSizeChanged;
Wnck.Screen.Default.ActiveWindowChanged += HandleActiveWindowChanged;
Wnck.Screen.Default.WindowClosed += WnckScreenDefaultWindowClosed;
Wnck.Screen.Default.WindowOpened += WnckScreenDefaultWindowOpened;
@@ -71,6 +72,11 @@
UpdateWindowIntersect ();
}
+ void HandleIconSizeChanged ()
+ {
+ UpdateWindowIntersect ();
+ }
+
void WnckScreenDefaultWindowOpened (object o, WindowOpenedArgs args)
{
UpdateWindowIntersect ();
@@ -144,7 +150,7 @@
.Where (w => w.IsActive && w.WindowType != Wnck.WindowType.Desktop)
.First ();
- intersect = rawWindows.Any (w => w.WindowType != Wnck.WindowType.Desktop &&
+ intersect = rawWindows.Any (w => !w.IsMinimized && w.WindowType != Wnck.WindowType.Desktop &&
activeWindow.Pid == w.Pid &&
w.EasyGeometry ().IntersectsWith (adjustedDockArea));
} catch {
@@ -156,11 +162,14 @@
#region IDisposable implementation
public void Dispose ()
{
- Wnck.Screen.Default.ActiveWindowChanged -= HandleActiveWindowChanged;
- Wnck.Screen.Default.WindowClosed -= WnckScreenDefaultWindowClosed;
- Wnck.Screen.Default.WindowOpened -= WnckScreenDefaultWindowOpened;
- Wnck.Screen.Default.ActiveWindow.GeometryChanged -= HandleGeometryChanged;
- Wnck.Screen.Default.ViewportsChanged -= HandleViewportsChanged;
+ DockPreferences.IconSizeChanged -= HandleIconSizeChanged;
+ if (Wnck.Screen.Default != null) {
+ Wnck.Screen.Default.ActiveWindowChanged -= HandleActiveWindowChanged;
+ Wnck.Screen.Default.WindowClosed -= WnckScreenDefaultWindowClosed;
+ Wnck.Screen.Default.WindowOpened -= WnckScreenDefaultWindowOpened;
+ Wnck.Screen.Default.ActiveWindow.GeometryChanged -= HandleGeometryChanged;
+ Wnck.Screen.Default.ViewportsChanged -= HandleViewportsChanged;
+ }
}
#endregion
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-do-0.8.2/Do.Interface.Linux.Docky/src/Docky.Interface/DockArea_Rendering.cs new/gnome-do-0.8.3/Do.Interface.Linux.Docky/src/Docky.Interface/DockArea_Rendering.cs
--- old/gnome-do-0.8.2/Do.Interface.Linux.Docky/src/Docky.Interface/DockArea_Rendering.cs 2009-06-26 05:39:51.000000000 +0200
+++ new/gnome-do-0.8.3/Do.Interface.Linux.Docky/src/Docky.Interface/DockArea_Rendering.cs 2009-06-29 02:19:29.000000000 +0200
@@ -568,7 +568,7 @@
InsertAnimationTime.TotalMilliseconds, 1);
cr.SetSource (iconSurface,
iconPosition.X / scale, iconPosition.Y / scale);
- cr.PaintWithAlpha (fadeInOpacity * (dockItem.ContainsMinimizedWindow ? .5 : 1));
+ cr.PaintWithAlpha (fadeInOpacity);
bool shade_light = DnDTracker.GtkDragging && !DnDTracker.PreviewIsDesktopFile && CursorIsOverDockArea &&
dockItem.IsAcceptingDrops && icon == PositionProvider.IndexAtPosition (Cursor);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-do-0.8.2/Do.Interface.Linux.Docky/src/Docky.Interface/DockState.cs new/gnome-do-0.8.3/Do.Interface.Linux.Docky/src/Docky.Interface/DockState.cs
--- old/gnome-do-0.8.2/Do.Interface.Linux.Docky/src/Docky.Interface/DockState.cs 2009-06-26 05:39:51.000000000 +0200
+++ new/gnome-do-0.8.3/Do.Interface.Linux.Docky/src/Docky.Interface/DockState.cs 2009-12-08 06:05:38.000000000 +0100
@@ -302,6 +302,7 @@
text_mode = new bool [3];
text_mode_timestamps = new DateTime [3];
+ text_mode_types = new TextModeType [3];
OnStateChanged ();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-do-0.8.2/Do.Interface.Linux.Docky/src/Docky.Interface/DockWindow.cs new/gnome-do-0.8.3/Do.Interface.Linux.Docky/src/Docky.Interface/DockWindow.cs
--- old/gnome-do-0.8.2/Do.Interface.Linux.Docky/src/Docky.Interface/DockWindow.cs 2009-06-26 05:39:51.000000000 +0200
+++ new/gnome-do-0.8.3/Do.Interface.Linux.Docky/src/Docky.Interface/DockWindow.cs 2009-12-08 06:16:03.000000000 +0100
@@ -112,6 +112,7 @@
StyleSet += HandleStyleSet;
+ Screen.Default.SizeChanged += HandleSizeChanged;
DockPreferences.AllowOverlapChanged += DelaySetStruts;
DockPreferences.AutohideChanged += DelaySetStruts;
DockPreferences.MonitorChanged += HandleMonitorChanged;
@@ -121,6 +122,7 @@
{
StyleSet -= HandleStyleSet;
+ Screen.Default.SizeChanged -= HandleSizeChanged;
DockPreferences.AllowOverlapChanged -= DelaySetStruts;
DockPreferences.AutohideChanged -= DelaySetStruts;
DockPreferences.MonitorChanged -= HandleMonitorChanged;
@@ -129,14 +131,21 @@
GLib.Source.Remove (strut_timer);
}
- void HandleMonitorChanged()
+ void HandleSizeChanged (object o, EventArgs args)
+ {
+ LayoutUtils.Recalculate ();
+ Reposition ();
+ DelaySetStruts ();
+ }
+
+ void HandleMonitorChanged ()
{
// bring us back down to "minimum" size
Resize (1, 1);
DelaySetStruts ();
}
- void HandleStyleSet(object o, StyleSetArgs args)
+ void HandleStyleSet (object o, StyleSetArgs args)
{
if (!IsRealized) return;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-do-0.8.2/Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/TrashDockItem.cs new/gnome-do-0.8.3/Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/TrashDockItem.cs
--- old/gnome-do-0.8.2/Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/TrashDockItem.cs 2009-06-26 05:39:51.000000000 +0200
+++ new/gnome-do-0.8.3/Do.Interface.Linux.Docky/src/Docky.Interface/Docky.Interface.Items/TrashDockItem.cs 2009-12-08 06:05:38.000000000 +0100
@@ -146,17 +146,12 @@
ResponseType result = (ResponseType) md.Run ();
md.Destroy ();
- if (result == ResponseType.Cancel)
- return;
-
- // fixme, this breaks the fsw
- if (!Directory.Exists (Trash)) return;
-
- try {
- Directory.Delete (Trash, true);
- Directory.CreateDirectory (Trash);
- } catch {
- // we dont give a rats ass
+ if (result != ResponseType.Cancel &&
+ Directory.Exists (Trash)) {
+ try {
+ Directory.Delete (Trash, true);
+ Directory.CreateDirectory (Trash);
+ } catch { /* do nothing */ }
}
SetupFileSystemWatch ();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-do-0.8.2/Do.Interface.Linux.Docky/src/Docky.Interface/DrawingService.cs new/gnome-do-0.8.3/Do.Interface.Linux.Docky/src/Docky.Interface/DrawingService.cs
--- old/gnome-do-0.8.2/Do.Interface.Linux.Docky/src/Docky.Interface/DrawingService.cs 2009-06-26 05:39:51.000000000 +0200
+++ new/gnome-do-0.8.3/Do.Interface.Linux.Docky/src/Docky.Interface/DrawingService.cs 2009-12-08 05:48:18.000000000 +0100
@@ -67,7 +67,7 @@
layout.Wrap = context.WrapMode;
if (context.FontSize != 0)
- layout.FontDescription.Size = Pango.Units.FromPixels (context.FontSize);
+ layout.FontDescription.AbsoluteSize = Pango.Units.FromPixels (context.FontSize);
Pango.Rectangle rect1, rect2;
layout.GetExtents (out rect1, out rect2);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-do-0.8.2/Do.Interface.Wink/src/AssemblyInfo.cs new/gnome-do-0.8.3/Do.Interface.Wink/src/AssemblyInfo.cs
--- old/gnome-do-0.8.2/Do.Interface.Wink/src/AssemblyInfo.cs 2009-06-26 07:48:30.000000000 +0200
+++ new/gnome-do-0.8.3/Do.Interface.Wink/src/AssemblyInfo.cs 2009-12-08 06:33:47.000000000 +0100
@@ -52,9 +52,9 @@
{
internal static class AssemblyInfo
{
- public const string DisplayVersion = "0.8.2";
- public const string VersionDetails = "bzr trunk r1261";
- public const string LocaleDirectory = "/usr/local/share/locale";
+ public const string DisplayVersion = "0.8.3";
+ public const string VersionDetails = "bzr core-0.8.2 r1278";
+ public const string LocaleDirectory = "/home/raof/.local/share/locale";
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-do-0.8.2/Do.Platform.Linux/src/AssemblyInfo.cs new/gnome-do-0.8.3/Do.Platform.Linux/src/AssemblyInfo.cs
--- old/gnome-do-0.8.2/Do.Platform.Linux/src/AssemblyInfo.cs 2009-06-26 07:48:30.000000000 +0200
+++ new/gnome-do-0.8.3/Do.Platform.Linux/src/AssemblyInfo.cs 2009-12-08 06:33:47.000000000 +0100
@@ -48,7 +48,7 @@
{
internal static class AssemblyInfo
{
- public const string InstallPrefix = "/usr/local";
- public const string InstallData = "/usr/local/share";
+ public const string InstallPrefix = "/home/raof/.local";
+ public const string InstallData = "/home/raof/.local/share";
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-do-0.8.2/Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/NetworkService.cs new/gnome-do-0.8.3/Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/NetworkService.cs
--- old/gnome-do-0.8.2/Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/NetworkService.cs 2009-06-26 05:39:51.000000000 +0200
+++ new/gnome-do-0.8.3/Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/NetworkService.cs 2009-12-08 06:25:28.000000000 +0100
@@ -48,18 +48,19 @@
public NetworkService ()
{
+ this.IsConnected = true;
try {
BusG.Init ();
if (Bus.System.NameHasOwner (NetworkManagerName)) {
network = Bus.System.GetObject<INetworkManager> (NetworkManagerName, new ObjectPath (NetworkManagerPath));
network.StateChanged += OnStateChanged;
+ SetConnected ();
}
} catch (Exception e) {
- Log<NetworkService>.Error ("Could not initialize dbus: {0}", e.Message);
+ // if something bad happened, log the error and assume we are connected
+ Log<NetworkService>.Error ("Could not initialize Network Manager dbus: {0}", e.Message);
Log<NetworkService>.Debug (e.StackTrace);
}
-
- SetConnected ();
}
void OnStateChanged (uint state)
@@ -81,7 +82,11 @@
NetworkState State {
get {
- return (NetworkState) Enum.ToObject (typeof (NetworkState), network.Get (NetworkManagerName, "State"));
+ try {
+ return (NetworkState) Enum.ToObject (typeof (NetworkState), network.Get (NetworkManagerName, "State"));
+ } catch (Exception) {
+ return NetworkState.Unknown;
+ }
}
}
@@ -91,4 +96,4 @@
#endregion
}
-}
\ No newline at end of file
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-do-0.8.2/Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/SystemService.cs new/gnome-do-0.8.3/Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/SystemService.cs
--- old/gnome-do-0.8.2/Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/SystemService.cs 2009-06-26 05:39:51.000000000 +0200
+++ new/gnome-do-0.8.3/Do.Platform.Linux/src/Do.Platform/Do.Platform.Linux/SystemService.cs 2009-12-08 06:01:16.000000000 +0100
@@ -18,6 +18,7 @@
//
using System;
+using System.IO;
using System.Reflection;
using NDesk.DBus;
@@ -174,6 +175,9 @@
autostartfile = DesktopItem.NewFromFile (System.IO.Path.Combine (AssemblyInfo.InstallData, "applications/gnome-do.desktop"),
DesktopItemLoadFlags.NoTranslations);
try {
+ if (!Directory.Exists (AutoStartDir))
+ Directory.CreateDirectory (AutoStartDir);
+
autostartfile.Save (AutoStartUri, true);
autostartfile.Location = AutoStartUri;
} catch (Exception e) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-do-0.8.2/Do.Platform.Linux/src/Do.Universe/ApplicationItem.cs new/gnome-do-0.8.3/Do.Platform.Linux/src/Do.Universe/ApplicationItem.cs
--- old/gnome-do-0.8.2/Do.Platform.Linux/src/Do.Universe/ApplicationItem.cs 2009-06-26 05:39:51.000000000 +0200
+++ new/gnome-do-0.8.3/Do.Platform.Linux/src/Do.Universe/ApplicationItem.cs 2009-12-08 06:30:43.000000000 +0100
@@ -50,22 +50,25 @@
if (path == null) throw new ArgumentNullException ("path");
- if (Instances.ContainsKey (key)) {
- appItem = Instances [key];
- } else {
- DesktopItem item = null;
- try {
- item = DesktopItem.NewFromFile (path, 0);
- appItem = new ApplicationItem (item);
- } catch (Exception e) {
- appItem = null;
- try { item.Dispose (); } catch { }
- Log.Error ("Could not load desktop item: {0}", e.Message);
- Log.Debug (e.StackTrace);
- }
+ lock (Instances)
+ {
+ if (Instances.ContainsKey (key)) {
+ appItem = Instances [key];
+ } else {
+ DesktopItem item = null;
+ try {
+ item = DesktopItem.NewFromFile (path, 0);
+ appItem = new ApplicationItem (item);
+ } catch (Exception e) {
+ appItem = null;
+ try { item.Dispose (); } catch { }
+ Log.Error ("Could not load desktop item: {0}", e.Message);
+ Log.Debug (e.StackTrace);
+ }
- if (appItem != null)
- Instances [key] = appItem;
+ if (appItem != null)
+ Instances [key] = appItem;
+ }
}
return appItem;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-do-0.8.2/Do.Platform.Linux/src/Do.Universe/ApplicationItemSource.cs new/gnome-do-0.8.3/Do.Platform.Linux/src/Do.Universe/ApplicationItemSource.cs
--- old/gnome-do-0.8.2/Do.Platform.Linux/src/Do.Universe/ApplicationItemSource.cs 2009-06-26 05:39:51.000000000 +0200
+++ new/gnome-do-0.8.3/Do.Platform.Linux/src/Do.Universe/ApplicationItemSource.cs 2009-12-08 06:05:38.000000000 +0100
@@ -93,8 +93,15 @@
IEnumerable<string> GetDesktopFiles (string parent)
{
- IEnumerable<string> baseFiles = Directory.GetFiles (parent, "*.desktop");
- IEnumerable<string> recursiveFiles = Directory.GetDirectories (parent).SelectMany (d => GetDesktopFiles (d));
+ IEnumerable<string> baseFiles = Enumerable.Empty<string> ();
+ IEnumerable<string> recursiveFiles = Enumerable.Empty<string> ();
+ // done separately so failures allow other directories to recurse
+ try {
+ baseFiles = Directory.GetFiles (parent, "*.desktop");
+ } catch (Exception) { }
+ try {
+ recursiveFiles = Directory.GetDirectories (parent).SelectMany (d => GetDesktopFiles (d));
+ } catch (Exception) { }
return baseFiles.Concat (recursiveFiles);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-do-0.8.2/Do.Platform.Linux/src/Do.Universe/CategoryItem.cs new/gnome-do-0.8.3/Do.Platform.Linux/src/Do.Universe/CategoryItem.cs
--- old/gnome-do-0.8.2/Do.Platform.Linux/src/Do.Universe/CategoryItem.cs 2009-06-26 05:39:51.000000000 +0200
+++ new/gnome-do-0.8.3/Do.Platform.Linux/src/Do.Universe/CategoryItem.cs 2009-12-08 06:30:43.000000000 +0100
@@ -48,9 +48,12 @@
public static CategoryItem GetCategoryItem (string category)
{
string lowCat = category.ToLower ();
- if (!Instances.ContainsKey (lowCat)) {
- CategoryItem item = new CategoryItem (category);
- Instances [lowCat] = item;
+ lock (Instances)
+ {
+ if (!Instances.ContainsKey (lowCat)) {
+ CategoryItem item = new CategoryItem (category);
+ Instances [lowCat] = item;
+ }
}
return Instances [lowCat];
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-do-0.8.2/Do.Universe/src/Do.Universe/Do.Universe.Safe/SafeElement.cs new/gnome-do-0.8.3/Do.Universe/src/Do.Universe/Do.Universe.Safe/SafeElement.cs
--- old/gnome-do-0.8.2/Do.Universe/src/Do.Universe/Do.Universe.Safe/SafeElement.cs 2009-06-26 05:39:51.000000000 +0200
+++ new/gnome-do-0.8.3/Do.Universe/src/Do.Universe/Do.Universe.Safe/SafeElement.cs 2009-12-08 06:09:43.000000000 +0100
@@ -33,7 +33,7 @@
public static void LogSafeError (Element who, Exception what, string where, string name)
{
Console.Error.WriteLine ("{0} \"{1}\" encountered an error in {2}: {3}.",
- who.GetType (), name, where, what.Message);
+ who.GetType (), name, where, what.ToString ());
}
public Element Element { protected get; set; }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-do-0.8.2/configure.ac new/gnome-do-0.8.3/configure.ac
--- old/gnome-do-0.8.2/configure.ac 2009-06-26 05:50:07.000000000 +0200
+++ new/gnome-do-0.8.3/configure.ac 2009-12-08 06:33:13.000000000 +0100
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.54])
-AC_INIT([gnome-do], [0.8.2])
+AC_INIT([gnome-do], [0.8.3])
AM_INIT_AUTOMAKE([foreign tar-pax])
AC_CONFIG_MACRO_DIR([m4])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gnome-do-0.8.2/missing new/gnome-do-0.8.3/missing
--- old/gnome-do-0.8.2/missing 2009-05-17 15:03:52.000000000 +0200
+++ new/gnome-do-0.8.3/missing 2009-08-14 11:32:22.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard