Do Plugins

Merge lp://qastaging/~jassmith/do-plugins/wink into lp://qastaging/do-plugins

  1. wink
  2. Merge into trunk
Proposed by Jason Smith
Status: Merged
Merged at revision: not available
Proposed branch: lp://qastaging/~jassmith/do-plugins/wink
Merge into: lp://qastaging/do-plugins
Diff against target: None lines
To merge this branch: bzr merge lp://qastaging/~jassmith/do-plugins/wink
Reviewer Review Type Date Requested Status
Do Plugins Team Pending
Review via email: mp+4739@code.qastaging.launchpad.net
To post a comment you must log in.
lp://qastaging/~jassmith/do-plugins/wink updated
585. By Jason Smith

Remove deadsie files

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'WindowManager/Makefile.am'
2--- WindowManager/Makefile.am 2009-01-09 03:35:25 +0000
3+++ WindowManager/Makefile.am 2009-03-20 23:05:29 +0000
4@@ -10,9 +10,7 @@
5 src/ScreenListAction.cs \
6 src/WindowListItems.cs \
7 src/GenericWindowItem.cs \
8- src/ScreenItemSource.cs \
9- src/Util.cs \
10- src/WindowControl.cs
11+ src/ScreenItemSource.cs
12
13 RESOURCES = \
14 Resources/WindowManager.addin.xml
15@@ -26,4 +24,5 @@
16 $(GLIB_SHARP_20_LIBS) \
17 $(GNOME_DESKTOP_SHARP_20_LIBS) \
18 $(DO_PLATFORM_LIBS) \
19- $(DO_UNIVERSE_LIBS)
20+ $(DO_UNIVERSE_LIBS) \
21+ $(DO_INTERFACE_WINK_LIBS)
22
23=== modified file 'WindowManager/WindowManager.mdp'
24--- WindowManager/WindowManager.mdp 2009-02-28 16:16:48 +0000
25+++ WindowManager/WindowManager.mdp 2009-03-20 23:05:29 +0000
26@@ -4,13 +4,13 @@
27 <Output directory="bin/Debug" assemblyKeyFile="." assembly="WindowManager" />
28 <Build debugmode="True" target="Library" />
29 <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
30- <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" definesymbols="DEBUG" generatexmldocumentation="False" win32Icon="." ctype="CSharpCompilerParameters" />
31+ <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
32 </Configuration>
33 <Configuration name="Release" ctype="DotNetProjectConfiguration">
34 <Output directory="bin/Release" assembly="WindowManager" />
35 <Build debugmode="False" target="Library" />
36 <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
37- <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" win32Icon="." ctype="CSharpCompilerParameters" />
38+ <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
39 </Configuration>
40 </Configurations>
41 <Contents>
42@@ -23,8 +23,6 @@
43 <File name="src/WindowListItems.cs" subtype="Code" buildaction="Compile" />
44 <File name="src/GenericWindowItem.cs" subtype="Code" buildaction="Compile" />
45 <File name="src/ScreenItemSource.cs" subtype="Code" buildaction="Compile" />
46- <File name="src/Util.cs" subtype="Code" buildaction="Compile" />
47- <File name="src/WindowControl.cs" subtype="Code" buildaction="Compile" />
48 <File name="Resources/WindowManager.addin.xml" subtype="Code" buildaction="EmbedAsResource" />
49 </Contents>
50 <References>
51@@ -39,4 +37,5 @@
52 <ProjectReference type="Gac" localcopy="True" refto="Do.Platform, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
53 <ProjectReference type="Gac" localcopy="True" refto="Do.Universe, Version=0.8.0.0, Culture=neutral, PublicKeyToken=null" />
54 </References>
55+ <LanguageParameters ApplicationIcon="." ctype="CSharpProjectParameters" />
56 </Project>
57\ No newline at end of file
58
59=== modified file 'WindowManager/src/ScreenListAction.cs'
60--- WindowManager/src/ScreenListAction.cs 2009-02-08 06:14:00 +0000
61+++ WindowManager/src/ScreenListAction.cs 2009-03-20 23:05:29 +0000
62@@ -26,6 +26,7 @@
63 using System.Threading;
64
65 using Do.Universe;
66+
67 using Wnck;
68 using Mono.Unix;
69
70
71=== modified file 'WindowManager/src/WindowListAction.cs'
72--- WindowManager/src/WindowListAction.cs 2009-02-28 05:23:31 +0000
73+++ WindowManager/src/WindowListAction.cs 2009-03-20 23:05:29 +0000
74@@ -27,6 +27,7 @@
75 using System.Threading;
76
77 using Do.Universe;
78+using Do.Interface.Wink;
79
80 using Wnck;
81 using Mono.Unix;
82@@ -138,7 +139,7 @@
83 string application = (item as IApplicationItem).Exec;
84 application = application.Split (new char[] {' '})[0];
85
86- return WindowManager.Util.GetApplicationList (application).Any ();
87+ return WindowUtils.GetApplicationList (application).Any ();
88 }
89
90 public override IEnumerable<Item> Perform (IEnumerable<Item> items, IEnumerable<Item> modItems)
91@@ -163,7 +164,7 @@
92 } else {
93 if (items.First () is IApplicationItem) {
94 List<Window> windows = new List<Window> ();
95- foreach (Wnck.Application app in WindowManager.Util.GetApplicationList ((items.First () as IApplicationItem).Exec))
96+ foreach (Wnck.Application app in WindowUtils.GetApplicationList ((items.First () as IApplicationItem).Exec))
97 windows.AddRange (app.Windows);
98 ToggleGroup (windows);
99 } else if (items.First () is GenericWindowItem) {
100@@ -262,7 +263,7 @@
101 } else {
102 if (items.First () is IApplicationItem) {
103 string application = (items.First () as IApplicationItem).Exec;
104- List<Application> apps = WindowManager.Util.GetApplicationList (application);
105+ List<Application> apps = WindowUtils.GetApplicationList (application);
106
107 WindowControl.CloseWindows (apps.SelectMany (app => app.Windows));
108
109
110=== modified file 'configure.ac'
111--- configure.ac 2009-03-17 18:54:16 +0000
112+++ configure.ac 2009-03-20 23:05:29 +0000
113@@ -92,10 +92,12 @@
114 PKG_CHECK_MODULES([DO_PLATFORM], [do.platform >= 0.8])
115 PKG_CHECK_MODULES([DO_PLATFORM_LINUX], [do.platform.linux >= 0.8])
116 PKG_CHECK_MODULES([DO_UNIVERSE], [do.universe >= 0.8])
117+PKG_CHECK_MODULES([DO_INTERFACE_WINK], [do.interface.wink >= 0.8])
118
119 AC_SUBST([DO_PLATFORM_LIBS])
120 AC_SUBST([DO_PLATFORM_LINUX_LIBS])
121 AC_SUBST([DO_UNIVERSE_LIBS])
122+AC_SUBST([DO_INTERFACE_WINK_LIBS])
123
124 AC_ARG_ENABLE(debug,
125 AC_HELP_STRING([--enable-debug],

Subscribers

People subscribed via source and target branches