diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-11-25 04:11:58 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-11-25 04:11:58 +0100 |
| commit | ccff5442184e84d511c2bd25ed3da53e4336a272 (patch) | |
| tree | 8402a0ba68852e0aec5841ed4519ccfe88352223 /src/threads | |
| parent | a1e1833f48ed618273dab9198b547148a89832a7 (diff) | |
| parent | 4a3f1fdfe1eb3743564adcee35d5513224339260 (diff) | |
Merge tag 'upstream/0.25.1'
Upstream version 0.25.1
Diffstat (limited to 'src/threads')
| -rw-r--r-- | src/threads/BackgroundJob.c | 8 | ||||
| -rw-r--r-- | src/threads/BackgroundJob.vala | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/threads/BackgroundJob.c b/src/threads/BackgroundJob.c index 02c8db6..caeab3b 100644 --- a/src/threads/BackgroundJob.c +++ b/src/threads/BackgroundJob.c @@ -237,7 +237,7 @@ enum { BACKGROUND_JOB_DUMMY_PROPERTY }; gint background_job_job_priority_compare (BackgroundJobJobPriority self, BackgroundJobJobPriority other); -gint background_job_job_priority_compare_func (void* a, void* b); +gint background_job_job_priority_compare_func (BackgroundJobJobPriority a, BackgroundJobJobPriority b); static gpointer background_job_notification_job_ref (gpointer instance); static void background_job_notification_job_unref (gpointer instance); static GParamSpec* background_job_param_spec_notification_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED; @@ -622,10 +622,10 @@ gint background_job_job_priority_compare (BackgroundJobJobPriority self, Backgro } -gint background_job_job_priority_compare_func (void* a, void* b) { +gint background_job_job_priority_compare_func (BackgroundJobJobPriority a, BackgroundJobJobPriority b) { gint result = 0; - void* _tmp0_ = NULL; - void* _tmp1_ = NULL; + BackgroundJobJobPriority _tmp0_ = 0; + BackgroundJobJobPriority _tmp1_ = 0; #line 79 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" _tmp0_ = b; #line 79 "/home/jens/Source/shotwell/src/threads/BackgroundJob.vala" diff --git a/src/threads/BackgroundJob.vala b/src/threads/BackgroundJob.vala index 2188425..5d259e7 100644 --- a/src/threads/BackgroundJob.vala +++ b/src/threads/BackgroundJob.vala @@ -75,7 +75,7 @@ public abstract class BackgroundJob { return (int) other - (int) this; } - public static int compare_func(void *a, void *b) { + public static int compare_func(JobPriority a, JobPriority b) { return (int) b - (int) a; } } |