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

Fix Linux build

Browse source
This commit is contained in:
Hylke Bons 2012-02-19 21:33:25 +01:00
parent 51758c5385
commit 135e2fe73f
7 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
SparkleLib/SparkleListenerTcp.cs
View file

@ -91,7 +91,8 @@ namespace SparkleLib {
this.is_connected = false; this.is_connected = false;
this.is_connecting = false; this.is_connecting = false;
this.socket.Dispose (); if (this.socket != null)
this.socket.Close ();
OnDisconnected (e.Message); OnDisconnected (e.Message);
return; return;
@ -158,7 +159,8 @@ namespace SparkleLib {
this.is_connected = false; this.is_connected = false;
this.is_connecting = false;; this.is_connecting = false;;
this.socket.Dispose (); if (this.socket != null)
this.socket.Close ();
OnDisconnected ("Ping timeout"); OnDisconnected ("Ping timeout");
return; return;
@ -244,6 +246,9 @@ namespace SparkleLib {
this.thread.Abort (); this.thread.Abort ();
this.thread.Join (); this.thread.Join ();
if (this.socket != null)
this.socket.Close ();
base.Dispose (); base.Dispose ();
} }

2
SparkleShare/Makefile.am
View file

@ -23,8 +23,8 @@ SOURCES = \
SparkleEventLog.cs \ SparkleEventLog.cs \
SparkleEventLogController.cs \ SparkleEventLogController.cs \
SparkleExtensions.cs \ SparkleExtensions.cs \
SparkleOptions.cs \
SparkleInvite.cs \ SparkleInvite.cs \
SparkleOptions.cs \
SparklePlugin.cs \ SparklePlugin.cs \
SparkleSetup.cs \ SparkleSetup.cs \
SparkleSetupController.cs \ SparkleSetupController.cs \

6
SparkleShare/SparkleController.cs
View file

@ -74,6 +74,12 @@ namespace SparkleShare {
SparkleHelpers.DebugInfo ("Controller", "Enabled autostart on login"); SparkleHelpers.DebugInfo ("Controller", "Enabled autostart on login");
} }
} }
public override void InstallProtocolHandler ()
{
// TODO
}
// Adds the SparkleShare folder to the user's // Adds the SparkleShare folder to the user's

5
SparkleShare/SparkleControllerBase.cs
View file

@ -94,10 +94,6 @@ namespace SparkleShare {
// Enables SparkleShare to start automatically at login // Enables SparkleShare to start automatically at login
public abstract void EnableSystemAutostart (); public abstract void EnableSystemAutostart ();
// Installs a launcher so the user can launch SparkleShare
// from the Internet category if needed
public abstract void InstallLauncher ();
// Installs the sparkleshare:// protocol handler // Installs the sparkleshare:// protocol handler
public abstract void InstallProtocolHandler (); public abstract void InstallProtocolHandler ();
@ -136,7 +132,6 @@ namespace SparkleShare {
public virtual void Initialize () public virtual void Initialize ()
{ {
InstallLauncher ();
EnableSystemAutostart (); EnableSystemAutostart ();
InstallProtocolHandler (); InstallProtocolHandler ();

14
SparkleShare/SparkleEventLog.cs
View file

@ -57,7 +57,7 @@ namespace SparkleShare {
Title = _("Recent Events"); Title = _("Recent Events");
IconName = "folder-sparkleshare"; IconName = "folder-sparkleshare";
DeleteEvent += Close (object o, DeleteEventArgs args) { DeleteEvent += delegate (object o, DeleteEventArgs args) {
Controller.WindowClosed (); Controller.WindowClosed ();
args.RetVal = true; args.RetVal = true;
}; };
@ -269,15 +269,15 @@ namespace SparkleShare {
AddAccelGroup (accel_group); AddAccelGroup (accel_group);
// Close on Esc // Close on Esc
close_1.AddAccelerator ("activate", accel_group, new AccelKey (Gdk.Key.W, Gdk.ModifierType.ControlMask, close_1.AddAccelerator ("activate", accel_group, new AccelKey (Gdk.Key.W,
AccelFlags.Visible)); Gdk.ModifierType.ControlMask, AccelFlags.Visible));
close_1.Activated += delegate { HideAll (); }; close_1.Activated += delegate { Controller.WindowClosed (); };
// Close on Ctrl+W // Close on Ctrl+W
close_2.AddAccelerator ("activate", accel_group, new AccelKey (Gdk.Key.Escape, Gdk.ModifierType.None, close_2.AddAccelerator ("activate", accel_group, new AccelKey (Gdk.Key.Escape,
AccelFlags.Visible)); Gdk.ModifierType.None, AccelFlags.Visible));
close_2.Activated += delegate { HideAll (); }; close_2.Activated += delegate { Controller.WindowClosed (); };
file_menu.Append (close_1); file_menu.Append (close_1);
file_menu.Append (close_2); file_menu.Append (close_2);

6
SparkleShare/SparkleSetup.cs
View file

@ -287,7 +287,7 @@ namespace SparkleShare {
}; };
layout_address.PackStart (new Label () { layout_address.PackStart (new Label () {
Markup = "<b>" + _("Address") + "</b>", Markup = "<b>" + _("Address:") + "</b>",
Xalign = 0 Xalign = 0
}, true, true, 0); }, true, true, 0);
@ -308,7 +308,7 @@ namespace SparkleShare {
}; };
layout_path.PackStart (new Label () { layout_path.PackStart (new Label () {
Markup = "<b>" + _("Remote Path") + "</b>", Markup = "<b>" + _("Remote Path:") + "</b>",
Xalign = 0 Xalign = 0
}, true, true, 0); }, true, true, 0);
@ -476,7 +476,7 @@ namespace SparkleShare {
Button finish_button = new Button (_("Finish")); Button finish_button = new Button (_("Finish"));
finish_button.Clicked += delegate { finish_button.Clicked += delegate {
Controller.FinishedPageCompleted (); Controller.FinishPageCompleted ();
}; };

2
SparkleShare/SparkleUI.cs
View file

@ -64,7 +64,7 @@ namespace SparkleShare {
StatusIcon = new SparkleStatusIcon (); StatusIcon = new SparkleStatusIcon ();
if (Program.Controller.FirstRun) if (Program.Controller.FirstRun)
Program.Controller.ShowSetupWindow (PageType.Setup) Program.Controller.ShowSetupWindow (PageType.Setup);
} }