mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-01-31 11:23:40 +00:00
Code Issues Releases Wiki Activity

(gtk) #5203 transmission-gtk shouldn't use gdk_threads_enter() and gdk_threads_leave() -- when we get an RPC notification, delegate the work back to the gtk thread.

Browse source
This commit is contained in:
Jordan Lee 2013-01-04 06:35:08 +00:00
parent 892b01ecff
commit 4e0ffffbf0
1 changed files with 36 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
gtk/main.c
View file

@ -334,71 +334,37 @@ on_main_window_size_allocated (GtkWidget * gtk_window,
**** listen to changes that come from RPC **** listen to changes that come from RPC
***/ ***/
struct rpc_idle_data struct on_rpc_changed_struct
{ {
TrCore * core; TrCore * core;
int id; tr_rpc_callback_type type;
gboolean delete_files; int torrent_id;
}; };
static gboolean static gboolean
rpc_torrent_remove_idle (gpointer gdata) on_rpc_changed_idle (gpointer gdata)
{
struct rpc_idle_data * data = gdata;
gtr_core_remove_torrent (data->core, data->id, data->delete_files);
g_free (data);
return FALSE; /* tell g_idle not to call this func twice */
}
static gboolean
rpc_torrent_add_idle (gpointer gdata)
{ {
tr_torrent * tor; tr_torrent * tor;
struct rpc_idle_data * data = gdata; struct on_rpc_changed_struct * data = gdata;
if ((tor = gtr_core_find_torrent (data->core, data->id))) switch (data->type)
gtr_core_add_torrent (data->core, tor, TRUE);
g_free (data);
return FALSE; /* tell g_idle not to call this func twice */
}
static tr_rpc_callback_status
on_rpc_changed (tr_session * session,
tr_rpc_callback_type type,
struct tr_torrent * tor,
void * gdata)
{
tr_rpc_callback_status status = TR_RPC_OK;
struct cbdata * cbdata = gdata;
gdk_threads_enter ();
switch (type)
{ {
case TR_RPC_SESSION_CLOSE: case TR_RPC_SESSION_CLOSE:
gtr_action_activate ("quit"); gtr_action_activate ("quit");
break; break;
case TR_RPC_TORRENT_ADDED: { case TR_RPC_TORRENT_ADDED:
struct rpc_idle_data * data = g_new0 (struct rpc_idle_data, 1); if ((tor = gtr_core_find_torrent (data->core, data->torrent_id)))
data->id = tr_torrentId (tor); gtr_core_add_torrent (data->core, tor, true);
data->core = cbdata->core;
gdk_threads_add_idle (rpc_torrent_add_idle, data);
break; break;
}
case TR_RPC_TORRENT_REMOVING: case TR_RPC_TORRENT_REMOVING:
case TR_RPC_TORRENT_TRASHING: { gtr_core_remove_torrent (data->core, data->torrent_id, false);
struct rpc_idle_data * data = g_new0 (struct rpc_idle_data, 1); break;
data->id = tr_torrentId (tor);
data->core = cbdata->core; case TR_RPC_TORRENT_TRASHING:
data->delete_files = type == TR_RPC_TORRENT_TRASHING; gtr_core_remove_torrent (data->core, data->torrent_id, true);
gdk_threads_add_idle (rpc_torrent_remove_idle, data);
status = TR_RPC_NOREMOVE;
break; break;
}
case TR_RPC_SESSION_CHANGED: { case TR_RPC_SESSION_CHANGED: {
int i; int i;
@ -408,6 +374,7 @@ on_rpc_changed (tr_session * session,
tr_quark key; tr_quark key;
GSList * l; GSList * l;
GSList * changed_keys = NULL; GSList * changed_keys = NULL;
tr_session * session = gtr_core_session (data->core);
tr_variantInitDict (&tmp, 100); tr_variantInitDict (&tmp, 100);
tr_sessionGetSettings (session, &tmp); tr_sessionGetSettings (session, &tmp);
for (i=0; tr_variantDictChild (&tmp, i, &key, &newval); ++i) for (i=0; tr_variantDictChild (&tmp, i, &key, &newval); ++i)
@ -433,7 +400,7 @@ on_rpc_changed (tr_session * session,
tr_sessionGetSettings (session, oldvals); tr_sessionGetSettings (session, oldvals);
for (l=changed_keys; l!=NULL; l=l->next) for (l=changed_keys; l!=NULL; l=l->next)
gtr_core_pref_changed (cbdata->core, GPOINTER_TO_INT(l->data)); gtr_core_pref_changed (data->core, GPOINTER_TO_INT(l->data));
g_slist_free (changed_keys); g_slist_free (changed_keys);
tr_variantFree (&tmp); tr_variantFree (&tmp);
@ -449,8 +416,26 @@ on_rpc_changed (tr_session * session,
break; break;
} }
gdk_threads_leave (); g_free (data);
return status; return G_SOURCE_REMOVE;
}
static tr_rpc_callback_status
on_rpc_changed (tr_session * session G_GNUC_UNUSED,
tr_rpc_callback_type type,
struct tr_torrent * tor,
void * gdata)
{
struct cbdata * cbdata = gdata;
struct on_rpc_changed_struct * data;
data = g_new (struct on_rpc_changed_struct, 1);
data->core = cbdata->core;
data->type = type;
data->torrent_id = tr_torrentId (tor);
gdk_threads_add_idle (on_rpc_changed_idle, data);
return TR_RPC_NOREMOVE;
} }
/*** /***