aboutsummaryrefslogtreecommitdiffstats
path: root/mail/importers
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2013-10-30 02:04:54 +0800
committerMatthew Barnes <mbarnes@redhat.com>2013-10-30 03:22:35 +0800
commitbc0d5d40ed39c92dcdf62ae891a2e99c25237d74 (patch)
treea07763eeaa20602bd4c0620b2fe67c443c52d29c /mail/importers
parentd3e0f96c73dde49acde92f6347b9e362d85e94aa (diff)
downloadgsoc2013-evolution-bc0d5d40ed39c92dcdf62ae891a2e99c25237d74.tar
gsoc2013-evolution-bc0d5d40ed39c92dcdf62ae891a2e99c25237d74.tar.gz
gsoc2013-evolution-bc0d5d40ed39c92dcdf62ae891a2e99c25237d74.tar.bz2
gsoc2013-evolution-bc0d5d40ed39c92dcdf62ae891a2e99c25237d74.tar.lz
gsoc2013-evolution-bc0d5d40ed39c92dcdf62ae891a2e99c25237d74.tar.xz
gsoc2013-evolution-bc0d5d40ed39c92dcdf62ae891a2e99c25237d74.tar.zst
gsoc2013-evolution-bc0d5d40ed39c92dcdf62ae891a2e99c25237d74.zip
Bug 710797 - Name all the timeouts added with g_timeout_add()
Diffstat (limited to 'mail/importers')
-rw-r--r--mail/importers/elm-importer.c3
-rw-r--r--mail/importers/evolution-mbox-importer.c3
-rw-r--r--mail/importers/pine-importer.c7
3 files changed, 8 insertions, 5 deletions
diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c
index 6a20bf4120..97ee58d474 100644
--- a/mail/importers/elm-importer.c
+++ b/mail/importers/elm-importer.c
@@ -292,7 +292,8 @@ mail_importer_elm_import (EImport *ei,
m->import = ei;
g_object_ref (m->import);
m->target = (EImportTargetHome *) target;
- m->status_timeout_id = g_timeout_add (100, elm_status_timeout, m);
+ m->status_timeout_id =
+ e_named_timeout_add (100, elm_status_timeout, m);
g_mutex_init (&m->status_lock);
m->status = camel_operation_new ();
diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c
index 1e8a09460e..3149441ff9 100644
--- a/mail/importers/evolution-mbox-importer.c
+++ b/mail/importers/evolution-mbox-importer.c
@@ -274,7 +274,8 @@ mbox_import (EImport *ei,
importer->import = ei;
importer->target = target;
g_mutex_init (&importer->status_lock);
- importer->status_timeout_id = g_timeout_add (100, mbox_status_timeout, importer);
+ importer->status_timeout_id =
+ e_named_timeout_add (100, mbox_status_timeout, importer);
importer->cancellable = camel_operation_new ();
g_signal_connect (
diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c
index c37d3bd809..4fd5f37e93 100644
--- a/mail/importers/pine-importer.c
+++ b/mail/importers/pine-importer.c
@@ -318,8 +318,9 @@ pine_status (CamelOperation *op,
}
static gboolean
-pine_status_timeout (struct _pine_import_msg *importer)
+pine_status_timeout (gpointer user_data)
{
+ struct _pine_import_msg *importer = user_data;
gint pc;
gchar *what;
@@ -358,8 +359,8 @@ mail_importer_pine_import (EImport *ei,
m->import = ei;
g_object_ref (m->import);
m->target = target;
- m->status_timeout_id = g_timeout_add (
- 100, (GSourceFunc) pine_status_timeout, m);
+ m->status_timeout_id = e_named_timeout_add (
+ 100, pine_status_timeout, m);
g_mutex_init (&m->status_lock);
m->cancellable = camel_operation_new ();