evolution-rss r142 - in trunk: . src

[lucilanga svn gnome org]

Author: lucilanga
Date: Sat Feb  2 11:56:09 2008
New Revision: 142
URL: http://svn.gnome.org/viewvc/evolution-rss?rev=142&view=rev

Log:
make auth less painfull

Modified:
   trunk/ChangeLog
   trunk/TODO
   trunk/src/network-soup.c

Modified: trunk/TODO
==============================================================================
--- trunk/TODO	(original)
+++ trunk/TODO	Sat Feb  2 11:56:09 2008
@@ -41,3 +41,4 @@
 	* when importing through dbus notify in status bar
 	* check mycall resize, verify data is valid widget -> generates crash
 	* check taskbar op when removing a feed
+	* check when adding feeds through dbus to pop for authentication if it's needed

Modified: trunk/src/network-soup.c
==============================================================================
--- trunk/src/network-soup.c	(original)
+++ trunk/src/network-soup.c	Sat Feb  2 11:56:09 2008
@@ -165,13 +165,11 @@
             g_strdup_printf("http://%s:%d/";, host_proxy, port_proxy); 
 
         SoupUri *puri = soup_uri_new (proxy_uri);
-	if (auth_proxy)
+/*	if (auth_proxy)
 	{
 		puri->user = g_strdup(user_proxy);
 		puri->passwd = g_strdup(pass_proxy);
-	}
-	g_print("user:%s\n", user_proxy);
-	g_print("pass:%s\n", pass_proxy);
+	}*/
        	g_object_set (G_OBJECT (session), SOUP_SESSION_PROXY_URI, puri, NULL);
         if (puri)
             g_free(puri);
@@ -272,37 +270,32 @@
         char **password,
         gpointer data)
 {
-	if (rf->soup_auth_retry)
+	gchar *user = g_hash_table_lookup(rf->hruser, data);
+	gchar *pass = g_hash_table_lookup(rf->hrpass, data);
+	if (user && pass)
 	{
+		*username = g_strdup(user);
+		*password = g_strdup(pass);
+	}
+	else
+	{
+		if (rf->soup_auth_retry)
+		{
 		//means we're already tested once and probably
 		//won't try again
 		rf->soup_auth_retry = FALSE;
-		g_print("simple auth\n");
-		gchar *user = g_hash_table_lookup(rf->hruser, data);
-		gchar *pass = g_hash_table_lookup(rf->hrpass, data);
-		if (user && pass)
+		if (!read_up(data))
 		{
-			*username = g_strdup(user);
-			*password = g_strdup(pass);
+			if (create_user_pass_dialog(data))
+				rf->soup_auth_retry = FALSE;
+			rf->soup_auth_retry = TRUE;
 		}
-		else
-		{
-			if (!read_up(data))
-				if (create_user_pass_dialog(data))
-					rf->soup_auth_retry = FALSE;
-				else
-					rf->soup_auth_retry = TRUE;
-
-			user = g_hash_table_lookup(rf->hruser, data);
-			pass = g_hash_table_lookup(rf->hrpass, data);
-			g_print("user:%s\n", user);
-			g_print("pass:%s\n", pass);
-			*username = g_strdup(user);
-			*password = g_strdup(pass);
+		*username = g_strdup(g_hash_table_lookup(rf->hruser, data));
+		*password = g_strdup(g_hash_table_lookup(rf->hrpass, data));
 		}
 	}
 }
-	
+
 static void
 reauthenticate (SoupSession *session,
         SoupMessage *msg,
@@ -313,8 +306,6 @@
         gpointer data)
 {
 	gchar *user, *pass;
-	g_print("status:%d\n", msg->status);
-	g_print("authtype:%s\n", auth_type);
 	if (rf->soup_auth_retry)
 	{
 		//means we're already tested once and probably
@@ -323,21 +314,13 @@
 		if (create_user_pass_dialog(data))
 		{
 			rf->soup_auth_retry = FALSE;
-			user = g_hash_table_lookup(rf->hruser, data);
-			pass = g_hash_table_lookup(rf->hrpass, data);
 		}
 		else
 		{
 			rf->soup_auth_retry = TRUE;
-			user = g_hash_table_lookup(rf->hruser, data);
-			pass = g_hash_table_lookup(rf->hrpass, data);
 		}
-		g_print("user:%s\n", user);
-		g_print("pass:%s\n", pass);
-		*username = g_strdup(user);
-		*password = g_strdup(pass);
-//        	*username = g_strdup(g_hash_table_lookup(rf->hruser, data));
-  //      	*password = g_strdup(g_hash_table_lookup(rf->hrpass, data));
+        	*username = g_strdup(g_hash_table_lookup(rf->hruser, data));
+        	*password = g_strdup(g_hash_table_lookup(rf->hrpass, data));
 	}
 }
 
@@ -348,6 +331,15 @@
   g_main_loop_quit (data);
 }
 
+
+
+static void
+handler (SoupMessage *msg, gpointer data)
+{
+	g_print("yodrax\n");
+}
+
+
 gboolean
 net_get_unblocking(const char *url, NetStatusCallback cb, 
 				gpointer data, gpointer cb2,