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
1=== modified file 'Docky.Items/Docky.Items.csproj'
2--- Docky.Items/Docky.Items.csproj 2010-07-28 05:47:23 +0000
3+++ Docky.Items/Docky.Items.csproj 2010-07-28 14:45:56 +0000
4@@ -56,9 +56,6 @@
5 <Reference Include="wnck-sharp, Version=2.20.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
6 <Package>wnck-sharp-1.0</Package>
7 </Reference>
8- <Reference Include="gnome-sharp, Version=2.24.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
9- <Package>gnome-sharp-2.0</Package>
10- </Reference>
11 <Reference Include="notify-sharp, Version=0.4.0.0, Culture=neutral, PublicKeyToken=2df29c54e245917a">
12 <Package>notify-sharp</Package>
13 </Reference>
14
15=== modified file 'Docky.Items/Docky.Items/ApplicationDockItem.cs'
16--- Docky.Items/Docky.Items/ApplicationDockItem.cs 2010-07-01 08:56:28 +0000
17+++ Docky.Items/Docky.Items/ApplicationDockItem.cs 2010-07-28 14:45:56 +0000
18@@ -17,13 +17,10 @@
19
20 using System;
21 using System.Collections.Generic;
22-using System.Collections.ObjectModel;
23 using System.IO;
24 using System.Linq;
25-using System.Text;
26-using System.Threading;
27
28-using Cairo;
29+using GLib;
30 using Gdk;
31 using Mono.Unix;
32 using Wnck;
33@@ -39,14 +36,14 @@
34 public static ApplicationDockItem NewFromUri (string uri)
35 {
36 try {
37- string filename = Gnome.Vfs.Global.GetLocalPathFromUri (uri);
38- if (!File.Exists (filename))
39+ GLib.File file = FileFactory.NewForUri (uri);
40+ if (!file.Exists)
41 return null;
42
43- DesktopItem desktopItem = WindowMatcher.Default.DesktopItemForDesktopFile (filename);
44+ DesktopItem desktopItem = WindowMatcher.Default.DesktopItemForDesktopFile (file.Path);
45
46 if (desktopItem == null)
47- desktopItem = new DesktopItem (filename);
48+ desktopItem = new DesktopItem (file.Path);
49
50 return new ApplicationDockItem (desktopItem);
51
52
53=== modified file 'Docky.Items/Docky.Items/FileDockItem.cs'
54--- Docky.Items/Docky.Items/FileDockItem.cs 2010-07-01 05:42:38 +0000
55+++ Docky.Items/Docky.Items/FileDockItem.cs 2010-07-28 14:45:56 +0000
56@@ -17,10 +17,8 @@
57
58 using System;
59 using System.Collections.Generic;
60-using System.Collections.ObjectModel;
61 using IO = System.IO;
62 using System.Linq;
63-using System.Text;
64
65 using GLib;
66 using Mono.Unix;
67@@ -43,13 +41,13 @@
68 // FIXME: need to do something with this... .Exists will fail for non native files
69 // but they are still valid file items (like an unmounted ftp://... file)
70 // even File.QueryExists () will return false for valid files (ftp://) that aren't mounted.
71-
72+
73 // for now we just attempt to figure out if it is a local file and check for its existance
74 if (uri.IndexOf ("file://") != -1 || uri.IndexOf ("://") == -1) {
75- string path = Gnome.Vfs.Global.GetLocalPathFromUri (uri);
76- if (!IO.Directory.Exists (path) && !IO.File.Exists (path))
77+ if (!GLib.FileFactory.NewForUri (uri).Exists)
78 return null;
79 }
80+
81 return new FileDockItem (uri, force_hover_text, backup_icon);
82 }
83
84
85=== modified file 'Docky.Items/Makefile.am'
86--- Docky.Items/Makefile.am 2010-07-28 05:47:23 +0000
87+++ Docky.Items/Makefile.am 2010-07-28 14:45:56 +0000
88@@ -61,8 +61,6 @@
89 $(GIO_SHARP_LIBS) \
90 $(LIBRSVG_SHARP_LIBS) \
91 $(WNCK_SHARP_10_LIBS) \
92- $(GNOME_SHARP_20_LIBS) \
93- $(NOTIFY_SHARP_LIBS) \
94- $(GNOME_VFS_SHARP_20_LIBS)
95+ $(NOTIFY_SHARP_LIBS)
96
97 MCS_FLAGS += -unsafe
98
99=== modified file 'Docky/Docky.csproj'
100--- Docky/Docky.csproj 2010-06-26 04:11:24 +0000
101+++ Docky/Docky.csproj 2010-07-28 14:45:56 +0000
102@@ -122,10 +122,6 @@
103 <Package>gtk-sharp-2.0</Package>
104 </Reference>
105 <Reference Include="Mono.Posix" />
106- <Reference Include="gnome-vfs-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
107- <SpecificVersion>False</SpecificVersion>
108- <Package>gnome-vfs-sharp-2.0</Package>
109- </Reference>
110 <Reference Include="gnomedesktop-sharp, Version=2.20.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
111 <Package>gnome-desktop-sharp-2.0</Package>
112 </Reference>
113
114=== modified file 'Docky/Docky/Docky.cs'
115--- Docky/Docky/Docky.cs 2010-06-26 21:23:37 +0000
116+++ Docky/Docky/Docky.cs 2010-07-28 14:45:56 +0000
117@@ -1,5 +1,5 @@
118 //
119-// Copyright (C) 2009-2010 Jason Smith, Robert Dyer
120+// Copyright (C) 2009-2010 Jason Smith, Robert Dyer, Chris Szikszoy
121 //
122 // This program is free software: you can redistribute it and/or modify
123 // it under the terms of the GNU General Public License as published by
124@@ -15,21 +15,13 @@
125 // along with this program. If not, see <http://www.gnu.org/licenses/>.
126 //
127
128-using System;
129-using System.Collections.Generic;
130-using System.ComponentModel;
131-using System.Linq;
132-using System.Text;
133 using System.Threading;
134-using System.IO;
135
136 using Mono.Unix;
137
138-using Gdk;
139 using Gtk;
140
141 using Docky.DBus;
142-using Docky.Windowing;
143 using Docky.Services;
144
145 namespace Docky
146@@ -61,7 +53,6 @@
147 GLib.Thread.Init ();
148 Gdk.Threads.Init ();
149 Gtk.Application.Init ("Docky", ref args);
150- Gnome.Vfs.Vfs.Initialize ();
151 GLib.GType.Init ();
152
153 // process the command line args
154@@ -107,7 +98,6 @@
155 Controller.Dispose ();
156 DockServices.Dispose ();
157 PluginManager.Shutdown ();
158- Gnome.Vfs.Vfs.Shutdown ();
159 }
160
161 static uint checkCompositeTimer = 0;
162
163=== modified file 'Docky/Makefile.am'
164--- Docky/Makefile.am 2010-06-26 04:11:24 +0000
165+++ Docky/Makefile.am 2010-07-28 14:45:56 +0000
166@@ -73,7 +73,6 @@
167 $(GTK_SHARP_20_LIBS) \
168 $(GNOME_DESKTOP_SHARP_20_LIBS) \
169 $(WNCK_SHARP_10_LIBS) \
170- $(GNOME_VFS_SHARP_20_LIBS) \
171 $(LIBRSVG_SHARP_LIBS) \
172 $(MONO_ADDINS_LIBS) \
173 $(MONO_ADDINS_GUI_LIBS) \
174
175=== modified file 'configure.ac'
176--- configure.ac 2010-07-01 15:32:27 +0000
177+++ configure.ac 2010-07-28 14:45:56 +0000
178@@ -63,8 +63,6 @@
179 PKG_CHECK_MODULES([GIO_SHARP], [gio-sharp-2.0])
180 PKG_CHECK_MODULES([GNOME_DESKTOP_SHARP_20], [gnome-desktop-sharp-2.0])
181 PKG_CHECK_MODULES([GNOME_KEYRING_SHARP], [gnome-keyring-sharp-1.0])
182-PKG_CHECK_MODULES([GNOME_SHARP_20], [gnome-sharp-2.0])
183-PKG_CHECK_MODULES([GNOME_VFS_SHARP_20], [gnome-vfs-sharp-2.0])
184 PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0])
185 PKG_CHECK_MODULES([LIBRSVG_SHARP], [rsvg2-sharp-2.0])
186 PKG_CHECK_MODULES([MONO_ADDINS], [mono-addins])
187@@ -89,8 +87,6 @@
188 AC_SUBST([GIO_SHARP_LIBS])
189 AC_SUBST([GNOME_DESKTOP_SHARP_20_LIBS])
190 AC_SUBST([GNOME_KEYRING_SHARP_LIBS])
191-AC_SUBST([GNOME_SHARP_20_LIBS])
192-AC_SUBST([GNOME_VFS_SHARP_20_LIBS])
193 AC_SUBST([GTK_SHARP_20_LIBS])
194 AC_SUBST([LIBRSVG_SHARP_LIBS])
195 AC_SUBST([MONO_ADDINS_LIBS])

Subscribers

People subscribed via source and target branches

to status/vote changes: