debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove unused variables in KatzeNet and simplify code

Browse source
This commit is contained in:
Christian Dywan 2010-10-04 23:58:19 +02:00
parent 5a0fc37d2f
commit 41f96167d1
1 changed files with 24 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
katze/katze-net.c
View file

@ -29,8 +29,6 @@ struct _KatzeNet
gchar* cache_path; gchar* cache_path;
guint cache_size; guint cache_size;
SoupSession* session;
}; };
struct _KatzeNetClass struct _KatzeNetClass
@ -57,8 +55,6 @@ katze_net_init (KatzeNet* net)
{ {
net->cache_path = g_build_filename (g_get_user_cache_dir (), net->cache_path = g_build_filename (g_get_user_cache_dir (),
PACKAGE_NAME, NULL); PACKAGE_NAME, NULL);
net->session = webkit_get_default_session ();
} }
static void static void
@ -90,7 +86,6 @@ katze_net_new (void)
typedef struct typedef struct
{ {
KatzeNet* net;
KatzeNetStatusCb status_cb; KatzeNetStatusCb status_cb;
KatzeNetTransferCb transfer_cb; KatzeNetTransferCb transfer_cb;
gpointer user_data; gpointer user_data;
@ -151,9 +146,7 @@ static void
katze_net_got_headers_cb (SoupMessage* msg, katze_net_got_headers_cb (SoupMessage* msg,
KatzeNetPriv* priv) KatzeNetPriv* priv)
{ {
KatzeNetRequest* request; KatzeNetRequest* request = priv->request;
request = priv->request;
switch (msg->status_code) switch (msg->status_code)
{ {
@ -171,7 +164,7 @@ katze_net_got_headers_cb (SoupMessage* msg,
{ {
g_signal_handlers_disconnect_by_func (msg, katze_net_got_headers_cb, priv); g_signal_handlers_disconnect_by_func (msg, katze_net_got_headers_cb, priv);
g_signal_handlers_disconnect_by_func (msg, katze_net_got_body_cb, priv); g_signal_handlers_disconnect_by_func (msg, katze_net_got_body_cb, priv);
soup_session_cancel_message (priv->net->session, msg, 1); soup_session_cancel_message (webkit_get_default_session (), msg, 1);
} }
} }
@ -179,9 +172,7 @@ static void
katze_net_got_body_cb (SoupMessage* msg, katze_net_got_body_cb (SoupMessage* msg,
KatzeNetPriv* priv) KatzeNetPriv* priv)
{ {
KatzeNetRequest* request; KatzeNetRequest* request = priv->request;
request = priv->request;
if (msg->response_body->length > 0) if (msg->response_body->length > 0)
{ {
@ -203,48 +194,35 @@ katze_net_finished_cb (SoupMessage* msg,
static gboolean static gboolean
katze_net_local_cb (KatzeNetPriv* priv) katze_net_local_cb (KatzeNetPriv* priv)
{ {
KatzeNetRequest* request; KatzeNetRequest* request = priv->request;
gchar* filename; gchar* filename = g_filename_from_uri (request->uri, NULL, NULL);
gchar* contents;
gsize length;
request = priv->request;
filename = g_filename_from_uri (request->uri, NULL, NULL);
if (!filename || g_access (filename, F_OK) != 0) if (!filename || g_access (filename, F_OK) != 0)
{ {
request->status = KATZE_NET_NOT_FOUND; request->status = KATZE_NET_NOT_FOUND;
if (priv->status_cb) if (priv->status_cb)
priv->status_cb (request, priv->user_data); priv->status_cb (request, priv->user_data);
katze_net_priv_free (priv);
return FALSE;
} }
request->status = KATZE_NET_VERIFIED; else if (!(priv->status_cb && !priv->status_cb (request, priv->user_data))
if (priv->status_cb && !priv->status_cb (request, priv->user_data)) && priv->transfer_cb)
{ {
katze_net_priv_free (priv); gchar* contents = NULL;
return FALSE; gsize length;
}
if (!priv->transfer_cb) request->status = KATZE_NET_VERIFIED;
{ if (!g_file_get_contents (filename, &contents, &length, NULL))
katze_net_priv_free (priv); {
return FALSE; request->status = KATZE_NET_FAILED;
} }
else
contents = NULL; {
if (!g_file_get_contents (filename, &contents, &length, NULL)) request->status = KATZE_NET_DONE;
{ request->data = contents;
request->status = KATZE_NET_FAILED; request->length = length;
}
priv->transfer_cb (request, priv->user_data); priv->transfer_cb (request, priv->user_data);
katze_net_priv_free (priv);
return FALSE;
} }
g_free (filename);
request->status = KATZE_NET_DONE;
request->data = contents;
request->length = length;
priv->transfer_cb (request, priv->user_data);
katze_net_priv_free (priv); katze_net_priv_free (priv);
return FALSE; return FALSE;
} }
@ -298,15 +276,12 @@ katze_net_load_uri (KatzeNet* net,
if (!status_cb && !transfer_cb) if (!status_cb && !transfer_cb)
return; return;
net = katze_net_new ();
request = g_new0 (KatzeNetRequest, 1); request = g_new0 (KatzeNetRequest, 1);
request->uri = g_strdup (uri); request->uri = g_strdup (uri);
request->mime_type = NULL; request->mime_type = NULL;
request->data = NULL; request->data = NULL;
priv = g_new0 (KatzeNetPriv, 1); priv = g_new0 (KatzeNetPriv, 1);
priv->net = net;
priv->status_cb = status_cb; priv->status_cb = status_cb;
priv->transfer_cb = transfer_cb; priv->transfer_cb = transfer_cb;
priv->user_data = user_data; priv->user_data = user_data;
@ -323,16 +298,13 @@ katze_net_load_uri (KatzeNet* net,
G_CALLBACK (katze_net_got_body_cb), priv); G_CALLBACK (katze_net_got_body_cb), priv);
g_signal_connect (msg, "finished", g_signal_connect (msg, "finished",
G_CALLBACK (katze_net_finished_cb), priv); G_CALLBACK (katze_net_finished_cb), priv);
soup_session_queue_message (net->session, msg, NULL, NULL); soup_session_queue_message (webkit_get_default_session (), msg, NULL, NULL);
return; return;
} }
if (g_str_has_prefix (uri, "file://")) if (g_str_has_prefix (uri, "file://"))
{
g_idle_add ((GSourceFunc)katze_net_local_cb, priv); g_idle_add ((GSourceFunc)katze_net_local_cb, priv);
return; else
} g_idle_add ((GSourceFunc)katze_net_default_cb, priv);
g_idle_add ((GSourceFunc)katze_net_default_cb, priv);
} }