beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix build. Closes #611

Browse source
This commit is contained in:
Hylke Bons 2012-03-12 01:05:18 +00:00
parent 065ad4074d
commit 9817b48708
3 changed files with 19 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
SparkleShare/Linux/Makefile.am
View file

@ -10,6 +10,17 @@ BUILD_DEFINES="-define:HAVE_APP_INDICATOR"
endif
SOURCES = \
../Program.cs \
../SparkleAboutController.cs \
../SparkleBubblesController.cs \
../SparkleControllerBase.cs \
../SparkleEventLogController.cs \
../SparkleExtensions.cs \
../SparkleInvite.cs \
../SparkleOptions.cs \
../SparklePlugin.cs \
../SparkleSetupController.cs \
../SparkleStatusIconController.cs \
SparkleAbout.cs \
SparkleBubbles.cs \
SparkleController.cs \

14
SparkleShare/Linux/SparkleEventLog.cs
View file

@ -23,6 +23,8 @@ using Gtk;
using Mono.Unix;
using WebKit;
using IO = System.IO;
namespace SparkleShare {
public class SparkleEventLog : Window {
@ -196,7 +198,7 @@ namespace SparkleShare {
store.AppendValues (folder);
if (folder.Equals (Controller.SelectedFolder))
this.combobox.Active = row;
this.combo_box.Active = row;
row++;
}
@ -233,7 +235,7 @@ namespace SparkleShare {
if (html == null)
return;
string pixmaps_path = Path.Combine (SparkleUI.AssetsPath, "pixmaps");
string pixmaps_path = IO.Path.Combine (SparkleUI.AssetsPath, "pixmaps");
string icons_path = new string [] {SparkleUI.AssetsPath, "icons",
"hicolor", "12x12", "status"}.Combine ();
@ -251,16 +253,16 @@ namespace SparkleShare {
html = html.Replace ("<!-- $pixmaps-path -->", pixmaps_path);
html = html.Replace ("<!-- $document-added-background-image -->",
"file://" + Path.Combine (icons_path + "document-added.png"));
"file://" + IO.Path.Combine (icons_path + "document-added.png"));
html = html.Replace ("<!-- $document-edited-background-image -->",
"file://" + Path.Combine (icons_path + "document-edited.png"));
"file://" + IO.Path.Combine (icons_path + "document-edited.png"));
html = html.Replace ("<!-- $document-deleted-background-image -->",
"file://" + Path.Combine (icons_path + "document-deleted.png"));
"file://" + IO.Path.Combine (icons_path + "document-deleted.png"));
html = html.Replace ("<!-- $document-moved-background-image -->",
"file://" + Path.Combine (icons_path + "document-moved.png"));
"file://" + IO.Path.Combine (icons_path + "document-moved.png"));
Application.Invoke (delegate {

18
SparkleShare/Linux/SparkleSetup.cs
View file

@ -253,14 +253,6 @@ namespace SparkleShare {
}
}));
address_entry.Completion = new EntryCompletion();
ListStore server_store = new ListStore (typeof (string));
foreach (string host in Program.Controller.PreviousHosts)
server_store.AppendValues (host);
address_entry.Completion.Model = server_store;
address_entry.Completion.TextColumn = 0;
address_entry.Changed += delegate {
Controller.CheckAddPage (address_entry.Text, path_entry.Text, tree.SelectedRow);
@ -274,16 +266,6 @@ namespace SparkleShare {
layout_address.PackStart (address_entry, false, false, 0);
layout_address.PackStart (address_example, false, false, 0);
path_entry.Completion = new EntryCompletion();
ListStore folder_store = new ListStore (typeof (string));
//foreach (string host in Program.Controller.FolderPaths)
// folder_store.AppendValues (host);
path_entry.Completion.Model = folder_store;
path_entry.Completion.TextColumn = 0;
path_entry.Changed += delegate {
Controller.CheckAddPage (address_entry.Text, path_entry.Text, tree.SelectedRow);
};