Docky

Merge lp:~cszikszoy/docky/rm-vfs into lp:docky

  1. rm-vfs
  2. Merge into trunk
Proposed by Chris S.
Status: Merged
Merged at revision: 1594
Proposed branch: lp:~cszikszoy/docky/rm-vfs
Merge into: lp:docky
Diff against target: 195 lines (+10/-39)
8 files modified
Docky.Items/Docky.Items.csproj (+0/-3)
Docky.Items/Docky.Items/ApplicationDockItem.cs (+5/-8)
Docky.Items/Docky.Items/FileDockItem.cs (+3/-5)
Docky.Items/Makefile.am (+1/-3)
Docky/Docky.csproj (+0/-4)
Docky/Docky/Docky.cs (+1/-11)
Docky/Makefile.am (+0/-1)
configure.ac (+0/-4)
To merge this branch: bzr merge lp:~cszikszoy/docky/rm-vfs
Reviewer Review Type Date Requested Status
Robert Dyer (community) Approve
Rico Tzschichholz Needs Fixing
Review via email: mp+31119@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Robert Dyer (psybers) wrote :

FileDockItem.cs - needs to check if the file exists, you removed that check and did not add a GLib.File equiv of it

review: Needs Fixing
lp:~cszikszoy/docky/rm-vfs updated
1594. By Chris S.

necessary evil, still need to think about a better way to do this. Maybe there isn't one?

Revision history for this message
Rico Tzschichholz (ricotz) wrote :

Do not delete docky.pot! ;-)

review: Needs Fixing
Revision history for this message
Chris S. (cszikszoy) wrote :

wtf, that's strange. I did a make clean before i committed to see that all the GNOME_SHARP and GNOME_VFS_SHARP references were removed from the makefiles, and that must have deleted the .pot file.

lp:~cszikszoy/docky/rm-vfs updated
1595. By Chris S.

undelete docky.pot. Thanks 'make clean'....

Revision history for this message
Rico Tzschichholz (ricotz) wrote :

FileDockItem.cs: You can remove "using IO = System.IO;"

The rest looks good!

Revision history for this message
Robert Dyer (psybers) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Docky.Items/Docky.Items.csproj'
--- Docky.Items/Docky.Items.csproj 2010-07-28 05:47:23 +0000
+++ Docky.Items/Docky.Items.csproj 2010-07-28 14:45:56 +0000
@@ -56,9 +56,6 @@
56 <Reference Include="wnck-sharp, Version=2.20.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">56 <Reference Include="wnck-sharp, Version=2.20.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
57 <Package>wnck-sharp-1.0</Package>57 <Package>wnck-sharp-1.0</Package>
58 </Reference>58 </Reference>
59 <Reference Include="gnome-sharp, Version=2.24.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
60 <Package>gnome-sharp-2.0</Package>
61 </Reference>
62 <Reference Include="notify-sharp, Version=0.4.0.0, Culture=neutral, PublicKeyToken=2df29c54e245917a">59 <Reference Include="notify-sharp, Version=0.4.0.0, Culture=neutral, PublicKeyToken=2df29c54e245917a">
63 <Package>notify-sharp</Package>60 <Package>notify-sharp</Package>
64 </Reference>61 </Reference>
6562
=== modified file 'Docky.Items/Docky.Items/ApplicationDockItem.cs'
--- Docky.Items/Docky.Items/ApplicationDockItem.cs 2010-07-01 08:56:28 +0000
+++ Docky.Items/Docky.Items/ApplicationDockItem.cs 2010-07-28 14:45:56 +0000
@@ -17,13 +17,10 @@
1717
18using System;18using System;
19using System.Collections.Generic;19using System.Collections.Generic;
20using System.Collections.ObjectModel;
21using System.IO;20using System.IO;
22using System.Linq;21using System.Linq;
23using System.Text;
24using System.Threading;
2522
26using Cairo;23using GLib;
27using Gdk;24using Gdk;
28using Mono.Unix;25using Mono.Unix;
29using Wnck;26using Wnck;
@@ -39,14 +36,14 @@
39 public static ApplicationDockItem NewFromUri (string uri)36 public static ApplicationDockItem NewFromUri (string uri)
40 {37 {
41 try {38 try {
42 string filename = Gnome.Vfs.Global.GetLocalPathFromUri (uri);39 GLib.File file = FileFactory.NewForUri (uri);
43 if (!File.Exists (filename))40 if (!file.Exists)
44 return null;41 return null;
45 42
46 DesktopItem desktopItem = WindowMatcher.Default.DesktopItemForDesktopFile (filename);43 DesktopItem desktopItem = WindowMatcher.Default.DesktopItemForDesktopFile (file.Path);
47 44
48 if (desktopItem == null)45 if (desktopItem == null)
49 desktopItem = new DesktopItem (filename);46 desktopItem = new DesktopItem (file.Path);
5047
51 return new ApplicationDockItem (desktopItem);48 return new ApplicationDockItem (desktopItem);
52 49
5350
=== modified file 'Docky.Items/Docky.Items/FileDockItem.cs'
--- Docky.Items/Docky.Items/FileDockItem.cs 2010-07-01 05:42:38 +0000
+++ Docky.Items/Docky.Items/FileDockItem.cs 2010-07-28 14:45:56 +0000
@@ -17,10 +17,8 @@
1717
18using System;18using System;
19using System.Collections.Generic;19using System.Collections.Generic;
20using System.Collections.ObjectModel;
21using IO = System.IO;20using IO = System.IO;
22using System.Linq;21using System.Linq;
23using System.Text;
2422
25using GLib;23using GLib;
26using Mono.Unix;24using Mono.Unix;
@@ -43,13 +41,13 @@
43 // FIXME: need to do something with this... .Exists will fail for non native files41 // FIXME: need to do something with this... .Exists will fail for non native files
44 // but they are still valid file items (like an unmounted ftp://... file)42 // but they are still valid file items (like an unmounted ftp://... file)
45 // even File.QueryExists () will return false for valid files (ftp://) that aren't mounted.43 // even File.QueryExists () will return false for valid files (ftp://) that aren't mounted.
46 44
47 // for now we just attempt to figure out if it is a local file and check for its existance45 // for now we just attempt to figure out if it is a local file and check for its existance
48 if (uri.IndexOf ("file://") != -1 || uri.IndexOf ("://") == -1) {46 if (uri.IndexOf ("file://") != -1 || uri.IndexOf ("://") == -1) {
49 string path = Gnome.Vfs.Global.GetLocalPathFromUri (uri);47 if (!GLib.FileFactory.NewForUri (uri).Exists)
50 if (!IO.Directory.Exists (path) && !IO.File.Exists (path))
51 return null;48 return null;
52 }49 }
50
53 return new FileDockItem (uri, force_hover_text, backup_icon);51 return new FileDockItem (uri, force_hover_text, backup_icon);
54 }52 }
55 53
5654
=== modified file 'Docky.Items/Makefile.am'
--- Docky.Items/Makefile.am 2010-07-28 05:47:23 +0000
+++ Docky.Items/Makefile.am 2010-07-28 14:45:56 +0000
@@ -61,8 +61,6 @@
61 $(GIO_SHARP_LIBS) \61 $(GIO_SHARP_LIBS) \
62 $(LIBRSVG_SHARP_LIBS) \62 $(LIBRSVG_SHARP_LIBS) \
63 $(WNCK_SHARP_10_LIBS) \63 $(WNCK_SHARP_10_LIBS) \
64 $(GNOME_SHARP_20_LIBS) \64 $(NOTIFY_SHARP_LIBS)
65 $(NOTIFY_SHARP_LIBS) \
66 $(GNOME_VFS_SHARP_20_LIBS)
67 65
68MCS_FLAGS += -unsafe66MCS_FLAGS += -unsafe
6967
=== modified file 'Docky/Docky.csproj'
--- Docky/Docky.csproj 2010-06-26 04:11:24 +0000
+++ Docky/Docky.csproj 2010-07-28 14:45:56 +0000
@@ -122,10 +122,6 @@
122 <Package>gtk-sharp-2.0</Package>122 <Package>gtk-sharp-2.0</Package>
123 </Reference>123 </Reference>
124 <Reference Include="Mono.Posix" />124 <Reference Include="Mono.Posix" />
125 <Reference Include="gnome-vfs-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
126 <SpecificVersion>False</SpecificVersion>
127 <Package>gnome-vfs-sharp-2.0</Package>
128 </Reference>
129 <Reference Include="gnomedesktop-sharp, Version=2.20.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">125 <Reference Include="gnomedesktop-sharp, Version=2.20.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
130 <Package>gnome-desktop-sharp-2.0</Package>126 <Package>gnome-desktop-sharp-2.0</Package>
131 </Reference>127 </Reference>
132128
=== modified file 'Docky/Docky/Docky.cs'
--- Docky/Docky/Docky.cs 2010-06-26 21:23:37 +0000
+++ Docky/Docky/Docky.cs 2010-07-28 14:45:56 +0000
@@ -1,5 +1,5 @@
1// 1//
2// Copyright (C) 2009-2010 Jason Smith, Robert Dyer2// Copyright (C) 2009-2010 Jason Smith, Robert Dyer, Chris Szikszoy
3// 3//
4// This program is free software: you can redistribute it and/or modify4// This program is free software: you can redistribute it and/or modify
5// it under the terms of the GNU General Public License as published by5// it under the terms of the GNU General Public License as published by
@@ -15,21 +15,13 @@
15// along with this program. If not, see <http://www.gnu.org/licenses/>.15// along with this program. If not, see <http://www.gnu.org/licenses/>.
16// 16//
1717
18using System;
19using System.Collections.Generic;
20using System.ComponentModel;
21using System.Linq;
22using System.Text;
23using System.Threading;18using System.Threading;
24using System.IO;
2519
26using Mono.Unix;20using Mono.Unix;
2721
28using Gdk;
29using Gtk;22using Gtk;
3023
31using Docky.DBus;24using Docky.DBus;
32using Docky.Windowing;
33using Docky.Services;25using Docky.Services;
3426
35namespace Docky27namespace Docky
@@ -61,7 +53,6 @@
61 GLib.Thread.Init ();53 GLib.Thread.Init ();
62 Gdk.Threads.Init ();54 Gdk.Threads.Init ();
63 Gtk.Application.Init ("Docky", ref args);55 Gtk.Application.Init ("Docky", ref args);
64 Gnome.Vfs.Vfs.Initialize ();
65 GLib.GType.Init ();56 GLib.GType.Init ();
66 57
67 // process the command line args58 // process the command line args
@@ -107,7 +98,6 @@
107 Controller.Dispose ();98 Controller.Dispose ();
108 DockServices.Dispose ();99 DockServices.Dispose ();
109 PluginManager.Shutdown ();100 PluginManager.Shutdown ();
110 Gnome.Vfs.Vfs.Shutdown ();
111 }101 }
112 102
113 static uint checkCompositeTimer = 0;103 static uint checkCompositeTimer = 0;
114104
=== modified file 'Docky/Makefile.am'
--- Docky/Makefile.am 2010-06-26 04:11:24 +0000
+++ Docky/Makefile.am 2010-07-28 14:45:56 +0000
@@ -73,7 +73,6 @@
73 $(GTK_SHARP_20_LIBS) \73 $(GTK_SHARP_20_LIBS) \
74 $(GNOME_DESKTOP_SHARP_20_LIBS) \74 $(GNOME_DESKTOP_SHARP_20_LIBS) \
75 $(WNCK_SHARP_10_LIBS) \75 $(WNCK_SHARP_10_LIBS) \
76 $(GNOME_VFS_SHARP_20_LIBS) \
77 $(LIBRSVG_SHARP_LIBS) \76 $(LIBRSVG_SHARP_LIBS) \
78 $(MONO_ADDINS_LIBS) \77 $(MONO_ADDINS_LIBS) \
79 $(MONO_ADDINS_GUI_LIBS) \78 $(MONO_ADDINS_GUI_LIBS) \
8079
=== modified file 'configure.ac'
--- configure.ac 2010-07-01 15:32:27 +0000
+++ configure.ac 2010-07-28 14:45:56 +0000
@@ -63,8 +63,6 @@
63PKG_CHECK_MODULES([GIO_SHARP], [gio-sharp-2.0])63PKG_CHECK_MODULES([GIO_SHARP], [gio-sharp-2.0])
64PKG_CHECK_MODULES([GNOME_DESKTOP_SHARP_20], [gnome-desktop-sharp-2.0])64PKG_CHECK_MODULES([GNOME_DESKTOP_SHARP_20], [gnome-desktop-sharp-2.0])
65PKG_CHECK_MODULES([GNOME_KEYRING_SHARP], [gnome-keyring-sharp-1.0])65PKG_CHECK_MODULES([GNOME_KEYRING_SHARP], [gnome-keyring-sharp-1.0])
66PKG_CHECK_MODULES([GNOME_SHARP_20], [gnome-sharp-2.0])
67PKG_CHECK_MODULES([GNOME_VFS_SHARP_20], [gnome-vfs-sharp-2.0])
68PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0])66PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0])
69PKG_CHECK_MODULES([LIBRSVG_SHARP], [rsvg2-sharp-2.0])67PKG_CHECK_MODULES([LIBRSVG_SHARP], [rsvg2-sharp-2.0])
70PKG_CHECK_MODULES([MONO_ADDINS], [mono-addins])68PKG_CHECK_MODULES([MONO_ADDINS], [mono-addins])
@@ -89,8 +87,6 @@
89AC_SUBST([GIO_SHARP_LIBS])87AC_SUBST([GIO_SHARP_LIBS])
90AC_SUBST([GNOME_DESKTOP_SHARP_20_LIBS])88AC_SUBST([GNOME_DESKTOP_SHARP_20_LIBS])
91AC_SUBST([GNOME_KEYRING_SHARP_LIBS])89AC_SUBST([GNOME_KEYRING_SHARP_LIBS])
92AC_SUBST([GNOME_SHARP_20_LIBS])
93AC_SUBST([GNOME_VFS_SHARP_20_LIBS])
94AC_SUBST([GTK_SHARP_20_LIBS])90AC_SUBST([GTK_SHARP_20_LIBS])
95AC_SUBST([LIBRSVG_SHARP_LIBS])91AC_SUBST([LIBRSVG_SHARP_LIBS])
96AC_SUBST([MONO_ADDINS_LIBS])92AC_SUBST([MONO_ADDINS_LIBS])

Subscribers

People subscribed via source and target branches

to status/vote changes: