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

mac: Fix build

Browse source
This commit is contained in:
Hylke Bons 2012-03-16 18:41:45 +00:00
parent 301e671747
commit 5ca7cc147a
3 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile.am
View file

@ -5,7 +5,9 @@ DIST_SUBDIRS = $(basedirs) SparkleShare
EXTRA_DIST = \ EXTRA_DIST = \
gnome-doc-utils.make \ gnome-doc-utils.make \
LICENSE LICENSE \
TRADEMARK \
AUTHORS
DISTCLEANFILES = \ DISTCLEANFILES = \
intltool-extract \ intltool-extract \

4
SparkleLib/SparkleListenerTcp.cs
View file

@ -105,7 +105,6 @@ namespace SparkleLib {
// Wait for messages // Wait for messages
while (this.is_connected) { while (this.is_connected) {
try { try {
// This blocks the thread // This blocks the thread
int i = 0; int i = 0;
@ -170,9 +169,6 @@ namespace SparkleLib {
} }
} catch (ObjectDisposedException) { } catch (ObjectDisposedException) {
this.is_connected = false;
this.is_connecting = false;
return; return;
} }

13
SparkleShare/Mac/SparkleEventLog.cs
View file

@ -251,7 +251,7 @@ namespace SparkleShare {
this.popup_button.AddItem (folder); this.popup_button.AddItem (folder);
if (folder.Equals (Controller.SelectedFolder)) if (folder.Equals (Controller.SelectedFolder))
this.popup_button.SelectItemAtIndex (row); this.popup_button.SelectItem (row);
row++; row++;
} }
@ -283,7 +283,7 @@ namespace SparkleShare {
if (html == null) if (html == null)
html = Controller.HTML; html = Controller.HTML;
string pixmaps_path = Path.Combine ( string pixmaps_path = "file://" + Path.Combine (
NSBundle.MainBundle.ResourcePath, "Pixmaps"); NSBundle.MainBundle.ResourcePath, "Pixmaps");
html = html.Replace ("<!-- $body-font-family -->", "Lucida Grande"); html = html.Replace ("<!-- $body-font-family -->", "Lucida Grande");
@ -298,17 +298,16 @@ namespace SparkleShare {
html = html.Replace ("<!-- $pixmaps-path -->", pixmaps_path); html = html.Replace ("<!-- $pixmaps-path -->", pixmaps_path);
html = html.Replace ("<!-- $document-added-background-image -->", html = html.Replace ("<!-- $document-added-background-image -->",
pixmaps_path + "/document-added-12.png")); pixmaps_path + "/document-added-12.png");
html = html.Replace ("<!-- $document-deleted-background-image -->", html = html.Replace ("<!-- $document-deleted-background-image -->",
pixmaps_path + "/document-deleted-12.png")); pixmaps_path + "/document-deleted-12.png");
html = html.Replace ("<!-- $document-edited-background-image -->", html = html.Replace ("<!-- $document-edited-background-image -->",
pixmaps_path + "/document-edited-12.png")); pixmaps_path + "/document-edited-12.png");
html = html.Replace ("<!-- $document-moved-background-image -->", html = html.Replace ("<!-- $document-moved-background-image -->",
pixmaps_path + "/document-moved-12.png")); pixmaps_path + "/document-moved-12.png");
InvokeOnMainThread (delegate { InvokeOnMainThread (delegate {
if (this.progress_indicator.Superview == ContentView) if (this.progress_indicator.Superview == ContentView)