[tuxdroid-svn] r4891 - software_suite_v2/software/gadgets/tuxdroid-gadget-facebook/trunk/tuxdroid-gadget-facebook/src

[jerome <c2m...@c2...>]

Author: jerome
Date: 2009-06-24 14:51:57 +0200 (Wed, 24 Jun 2009)
New Revision: 4891

Modified:
   software_suite_v2/software/gadgets/tuxdroid-gadget-facebook/trunk/tuxdroid-gadget-facebook/src/FacebookConnection.java
   software_suite_v2/software/gadgets/tuxdroid-gadget-facebook/trunk/tuxdroid-gadget-facebook/src/FacebookGadget.java
Log:
* Removed tux api references.

Modified: software_suite_v2/software/gadgets/tuxdroid-gadget-facebook/trunk/tuxdroid-gadget-facebook/src/FacebookConnection.java
===================================================================
--- software_suite_v2/software/gadgets/tuxdroid-gadget-facebook/trunk/tuxdroid-gadget-facebook/src/FacebookConnection.java	2009-06-24 12:43:52 UTC (rev 4890)
+++ software_suite_v2/software/gadgets/tuxdroid-gadget-facebook/trunk/tuxdroid-gadget-facebook/src/FacebookConnection.java	2009-06-24 12:51:57 UTC (rev 4891)
@@ -25,7 +25,6 @@
 
 import com.facebook.api.FacebookException;
 import com.facebook.api.FacebookRestClient;
-import com.tuxisalive.api.TuxAPI;
 
 public class FacebookConnection {
 
@@ -37,7 +36,7 @@
 	/**
 	 * Class constructor.
 	 */
-	public FacebookConnection(FacebookGadget gdg, TuxAPI tux, String login, String password)
+	public FacebookConnection(FacebookGadget gdg, String login, String password)
 	{
 		try
 		{

Modified: software_suite_v2/software/gadgets/tuxdroid-gadget-facebook/trunk/tuxdroid-gadget-facebook/src/FacebookGadget.java
===================================================================
--- software_suite_v2/software/gadgets/tuxdroid-gadget-facebook/trunk/tuxdroid-gadget-facebook/src/FacebookGadget.java	2009-06-24 12:43:52 UTC (rev 4890)
+++ software_suite_v2/software/gadgets/tuxdroid-gadget-facebook/trunk/tuxdroid-gadget-facebook/src/FacebookGadget.java	2009-06-24 12:51:57 UTC (rev 4891)
@@ -22,8 +22,6 @@
 
 import com.kysoh.tuxdroid.gadget.framework.gadget.SimpleGadget;
 import com.kysoh.tuxdroid.gadget.framework.gadget.SimpleGadgetConfiguration;
-import com.tuxisalive.api.TuxAPI;
-import com.tuxisalive.api.TuxAPIConst;
 
 /**
  * Facebook gadget class.
@@ -32,8 +30,6 @@
  */
 public class FacebookGadget extends SimpleGadget<FacebookGadget.Configuration>{
 	
-	private TuxAPI tux = null;
-	
 	/**
 	 * Configuration Class.
 	 * @author nux
@@ -194,14 +190,12 @@
 		if ( !(this.configuration().notifyEmail || this.configuration().showEventsInvites || this.configuration().showFriendRequests
 				|| this.configuration().showGroupsInvites || this.configuration().showPokes))
 		{
-			System.exit(0);
+			this.quitGadget();
 		}
 		
-		this.connectTuxApi();
-		
 		if(true)
 		{
-			FacebookConnection facebook = new FacebookConnection(this, tux, this.configuration().getLogin(), this.configuration().getPassword());
+			FacebookConnection facebook = new FacebookConnection(this, this.configuration().getLogin(), this.configuration().getPassword());
 			FacebookFunctions functions = new FacebookFunctions(facebook);
 			
 			//Get email informations.
@@ -308,22 +302,11 @@
 	
 	
 	/**
-	 * Create tux api object.
-	 */
-	private void connectTuxApi()
-	{
-		this.tux = new TuxAPI("127.0.0.1", 270);
-		this.tux.server.autoConnect(TuxAPIConst.CLIENT_LEVEL_FREE, "tuxdroid-facebook-gadget", "tdfcgd");
-		tux.server.waitConnected(3.0);
-	}
-	
-	
-	/**
 	 * Called when user stop the gadget.
 	 */
 	private void quitGadget()
 	{
-		tux.destroy();
+		System.exit(0);
 	}