Fix all compiler warnings

22 files changed, 71 insertions, 104 deletions

diff --git a/backends/aptcc/acqpkitstatus.cpp b/backends/aptcc/acqpkitstatus.cpp
index 972299b5d..fcc5e69ea 100644
--- a/backends/aptcc/acqpkitstatus.cpp
+++ b/backends/aptcc/acqpkitstatus.cpp
@@ -169,10 +169,9 @@ bool AcqPackageKitStatus::Pulse(pkgAcquire *Owner)
     }
 
     // calculate the overall speed
-    double localCPS = (CurrentCPS >= 0) ? CurrentCPS : -1 * CurrentCPS;
-    if (localCPS != m_lastCPS)
+    if (CurrentCPS != m_lastCPS)
     {
-        m_lastCPS = localCPS;
+        m_lastCPS = CurrentCPS;
         pk_backend_job_set_speed(m_job, static_cast<uint>(m_lastCPS));
     }
 
diff --git a/backends/aptcc/apt-cache-file.cpp b/backends/aptcc/apt-cache-file.cpp
index 5ae93552e..62d0e2f3b 100644
--- a/backends/aptcc/apt-cache-file.cpp
+++ b/backends/aptcc/apt-cache-file.cpp
@@ -70,9 +70,6 @@ bool AptCacheFile::BuildCaches(bool withLock)
 
 bool AptCacheFile::CheckDeps(bool AllowBroken)
 {
-    PkRoleEnum role = pk_backend_job_get_role(m_job);
-    bool FixBroken = (role == PK_ROLE_ENUM_REPAIR_SYSTEM);
-
     if (_error->PendingError() == true) {
         return false;
     }
diff --git a/backends/aptcc/apt-intf.cpp b/backends/aptcc/apt-intf.cpp
index f70faa3d1..8b055e79b 100644
--- a/backends/aptcc/apt-intf.cpp
+++ b/backends/aptcc/apt-intf.cpp
@@ -60,11 +60,11 @@ using namespace APT;
 #define RAMFS_MAGIC     0x858458f6
 
 AptIntf::AptIntf(PkBackendJob *job) :
+    m_cache(0),
     m_job(job),
     m_cancel(false),
-    m_terminalTimeout(120),
     m_lastSubProgress(0),
-    m_cache(0)
+    m_terminalTimeout(120)
 {
     m_cancel = false;
 }
@@ -134,9 +134,8 @@ bool AptIntf::init(gchar **localDebs)
             return false;
         }
 
-        for (int i = 0; i < g_strv_length(localDebs); ++i) {
+        for (guint i = 0; i < g_strv_length(localDebs); ++i)
             markFileForInstall(localDebs[i]);
-        }
     }
 
     int timeout = 10;
@@ -603,7 +602,7 @@ void AptIntf::providesLibrary(PkgList &output, gchar **values)
 
             string strvalue = string(value);
             ssize_t pos = strvalue.find (".so.");
-            if ((pos != string::npos) && (pos > 0)) {
+            if ((pos > 0) && ((size_t) pos != string::npos)) {
                 // If last char is a number, add a "-" (to be policy-compliant)
                 if (g_ascii_isdigit (libPkgName.at (libPkgName.length () - 1))) {
                     libPkgName.append ("-");
@@ -1065,7 +1064,7 @@ PkgList AptIntf::getPackagesFromGroup(gchar **values)
     PkgList output;
     vector<PkGroupEnum> groups;
 
-    int len = g_strv_length(values);
+    uint len = g_strv_length(values);
     for (uint i = 0; i < len; i++) {
         if (values[i] == NULL) {
             pk_backend_job_error_code(m_job,
@@ -1799,8 +1798,7 @@ void AptIntf::updateInterface(int fd, int writeFd)
                                           str);
             } else if (strstr(status, "pmconffile") != NULL) {
                 // conffile-request from dpkg, needs to be parsed different
-                int i=0;
-                int count=0;
+                int i = 0;
                 string orig_file, new_file;
 
                 // go to first ' and read until the end
@@ -2192,7 +2190,7 @@ bool AptIntf::markFileForInstall(std::string const &file)
 PkgList AptIntf::resolveLocalFiles(gchar **localDebs)
 {
     PkgList ret;
-    for (int i = 0; i < g_strv_length(localDebs); ++i) {
+    for (guint i = 0; i < g_strv_length(localDebs); ++i) {
         pkgCache::PkgIterator const P = (*m_cache)->FindPkg(localDebs[i]);
         if (P.end()) {
             continue;
@@ -2213,12 +2211,8 @@ PkgList AptIntf::resolveLocalFiles(gchar **localDebs)
 bool AptIntf::runTransaction(const PkgList &install, const PkgList &remove, const PkgList &update,
                              bool fixBroken, PkBitfield flags, bool autoremove)
 {
-    //cout << "runTransaction" << simulate << remove << endl;
-
     pk_backend_job_set_status (m_job, PK_STATUS_ENUM_RUNNING);
 
-    bool simulate = pk_bitfield_contain(flags, PK_TRANSACTION_FLAG_ENUM_SIMULATE);
-
     // Enter the special broken fixing mode if the user specified arguments
     // THIS mode will run if fixBroken is false and the cache has broken packages
     bool BrokenFix = false;
diff --git a/backends/aptcc/apt-sourceslist.cpp b/backends/aptcc/apt-sourceslist.cpp
index 6dad2f7c8..c0d3a94c7 100644
--- a/backends/aptcc/apt-sourceslist.cpp
+++ b/backends/aptcc/apt-sourceslist.cpp
@@ -660,7 +660,7 @@ ostream &operator<<(ostream &os, const SourcesList::SourceRecord &rec)
     return os;
 }
 
-ostream &operator<<(ostream &os, const SourcesList::VendorRecord &rec)
+ostream &operator <<(ostream &os, const SourcesList::VendorRecord &rec)
 {
     os << "VendorID: " << rec.VendorID << endl;
     os << "FingerPrint: " << rec.FingerPrint << endl;
diff --git a/backends/aptcc/apt-sourceslist.h b/backends/aptcc/apt-sourceslist.h
index b7e5a5d91..fa3291963 100644
--- a/backends/aptcc/apt-sourceslist.h
+++ b/backends/aptcc/apt-sourceslist.h
@@ -114,5 +114,6 @@ public:
 typedef list<SourcesList::SourceRecord *>::iterator SourcesListIter;
 
 ostream &operator <<(ostream &, const SourcesList::SourceRecord &);
+ostream &operator <<(ostream &os, const SourcesList::VendorRecord &rec);
 
 #endif
diff --git a/backends/aptcc/apt-utils.cpp b/backends/aptcc/apt-utils.cpp
index 9edcb2180..e59247c1c 100644
--- a/backends/aptcc/apt-utils.cpp
+++ b/backends/aptcc/apt-utils.cpp
@@ -156,16 +156,6 @@ PkGroupEnum get_enum_group(string group)
     }
 }
 
-bool strIsPrefix(string const& s1, string const&s2)
-{
-    const char*p = s1.c_str();
-    const char*q = s2.c_str();
-    while (*p&&*q)
-        if (*p++!=*q++)
-            return false;
-    return true;
-}
-
 string fetchChangelogData(AptCacheFile &CacheFile,
                           pkgAcquire &Fetcher,
                           pkgCache::VerIterator Ver,
@@ -263,17 +253,16 @@ string fetchChangelogData(AptCacheFile &CacheFile,
             // and when it got updated
             GMatchInfo *match_info;
             if (g_regex_match(regexDate, str, G_REGEX_MATCH_ANCHORED, &match_info)) {
-                GTimeVal dateTime = {0, 0};
-                gchar *date;
+                g_autoptr(GDateTime) dateTime = NULL;
+                g_autofree gchar *date = NULL;
                 date = g_match_info_fetch_named(match_info, "date");
                 time_t time;
                 g_warn_if_fail(RFC1123StrToTime(date, time));
-                dateTime.tv_sec = time;
-                g_free(date);
+                dateTime = g_date_time_new_from_unix_local(time);
 
-                *issued = g_time_val_to_iso8601(&dateTime);
+                *issued = g_date_time_format_iso8601(dateTime);
                 if (updated->empty()) {
-                    *updated = g_time_val_to_iso8601(&dateTime);
+                    *updated = g_date_time_format_iso8601(dateTime);
                 }
             }
             g_match_info_free(match_info);
diff --git a/backends/aptcc/pk-backend-aptcc.cpp b/backends/aptcc/pk-backend-aptcc.cpp
index 8b91eae85..e289d21d6 100644
--- a/backends/aptcc/pk-backend-aptcc.cpp
+++ b/backends/aptcc/pk-backend-aptcc.cpp
@@ -358,9 +358,8 @@ static void backend_get_files_local_thread(PkBackendJob *job, GVariant *params,
 
     AptIntf *apt = static_cast<AptIntf*>(pk_backend_job_get_user_data(job));
 
-    for (int i = 0; i < g_strv_length(files); ++i) {
+    for (guint i = 0; i < g_strv_length(files); ++i)
         apt->emitPackageFilesLocal(files[i]);
-    }
 }
 
 void pk_backend_get_files_local(PkBackend *backend, PkBackendJob *job, gchar **files)
@@ -407,9 +406,7 @@ void pk_backend_get_updates(PkBackend *backend, PkBackendJob *job, PkBitfield fi
 static void backend_what_provides_thread(PkBackendJob *job, GVariant *params, gpointer user_data)
 {
     PkBitfield filters;
-    const gchar *provides_text;
     gchar **values;
-    bool error = false;
     AptIntf *apt = static_cast<AptIntf*>(pk_backend_job_get_user_data(job));
 
     g_variant_get(params, "(t^a&s)",
@@ -741,7 +738,6 @@ static void backend_manage_packages_thread(PkBackendJob *job, GVariant *params,
     PkBitfield transaction_flags = 0;
     gboolean allow_deps = false;
     gboolean autoremove = false;
-    bool fileInstall = false;
     gchar **full_paths = NULL;
     gchar **package_ids = NULL;
 
@@ -751,7 +747,6 @@ static void backend_manage_packages_thread(PkBackendJob *job, GVariant *params,
         g_variant_get(params, "(t^a&s)",
                       &transaction_flags,
                       &full_paths);
-        fileInstall = true;
     } else if (role == PK_ROLE_ENUM_REMOVE_PACKAGES) {
         g_variant_get(params, "(t^a&sbb)",
                       &transaction_flags,
@@ -768,14 +763,6 @@ static void backend_manage_packages_thread(PkBackendJob *job, GVariant *params,
                       &package_ids);
     }
 
-    // Check if we should only simulate the install (calculate dependencies)
-    bool simulate;
-    simulate = pk_bitfield_contain(transaction_flags, PK_TRANSACTION_FLAG_ENUM_SIMULATE);
-
-    // Check if we should only download all the required packages for this transaction
-    bool downloadOnly;
-    downloadOnly = pk_bitfield_contain(transaction_flags, PK_TRANSACTION_FLAG_ENUM_ONLY_DOWNLOAD);
-
     // Check if we should fix broken packages
     bool fixBroken = false;
     if (role == PK_ROLE_ENUM_REPAIR_SYSTEM) {
@@ -884,7 +871,6 @@ static void backend_repo_manager_thread(PkBackendJob *job, GVariant *params, gpo
     bool found = false;
     // generic
     PkRoleEnum role;
-    AptIntf *apt = static_cast<AptIntf*>(pk_backend_job_get_user_data(job));
 
     role = pk_backend_job_get_role(job);
     if (role == PK_ROLE_ENUM_GET_REPO_LIST) {
diff --git a/backends/dummy/pk-backend-dummy.c b/backends/dummy/pk-backend-dummy.c
index 311b516f8..c610e1d6b 100644
--- a/backends/dummy/pk-backend-dummy.c
+++ b/backends/dummy/pk-backend-dummy.c
@@ -1288,7 +1288,7 @@ pk_backend_update_packages (PkBackend *backend, PkBackendJob *job, PkBitfield tr
 
 		/* socket has data */
 		source = g_socket_create_source (job_data->socket, G_IO_IN | G_IO_ERR | G_IO_HUP | G_IO_NVAL, NULL);
-		g_source_set_callback (source, (GSourceFunc) pk_backend_socket_has_data_cb, job, NULL);
+		g_source_set_callback (source, G_SOURCE_FUNC (pk_backend_socket_has_data_cb), job, NULL);
 		job_data->socket_listen_id = g_source_attach (source, NULL);
 
 		/* send some data */
diff --git a/client/pk-console.c b/client/pk-console.c
index 44da4b257..3d027e601 100644
--- a/client/pk-console.c
+++ b/client/pk-console.c
@@ -229,7 +229,7 @@ pk_console_distro_upgrade_cb (PkDistroUpgrade *item, gpointer user_data)
 	/* TRANSLATORS: this is the distro, e.g. Fedora 10 */
 	g_print ("%s: %s\n", _("Distribution"), name);
 	/* TRANSLATORS: this is type of update, stable or testing */
-	g_print (" %s: %s\n", _("Type"), pk_update_state_enum_to_string (state));
+	g_print (" %s: %s\n", _("Type"), pk_distro_upgrade_enum_to_string (state));
 	/* TRANSLATORS: this is any summary text describing the upgrade */
 	g_print (" %s: %s\n", _("Summary"), summary);
 }
diff --git a/contrib/gtk-module/pk-gtk-module.c b/contrib/gtk-module/pk-gtk-module.c
index 74a68cc77..98303c17a 100644
--- a/contrib/gtk-module/pk-gtk-module.c
+++ b/contrib/gtk-module/pk-gtk-module.c
@@ -262,7 +262,7 @@ pk_pango_fc_font_map_load_fontset (PangoFontMap *font_map,
 }
 
 static void
-pk_pango_fc_font_map_class_init (PangoFontMapClass *klass)
+pk_pango_fc_font_map_class_init (PangoFontMapClass *klass, gpointer class_data)
 {
 	g_return_if_fail (pk_pango_fc_font_map_load_fontset_default == NULL);
 
diff --git a/lib/packagekit-glib2/pk-bitfield.c b/lib/packagekit-glib2/pk-bitfield.c
index e02da19a8..3012f26b6 100644
--- a/lib/packagekit-glib2/pk-bitfield.c
+++ b/lib/packagekit-glib2/pk-bitfield.c
@@ -368,7 +368,7 @@ pk_transaction_flag_bitfield_from_string (const gchar *transaction_flags)
 	PkBitfield transaction_flags_enum = 0;
 	guint length;
 	guint i;
-	PkFilterEnum transaction_flag;
+	PkTransactionFlagEnum transaction_flag;
 	g_auto(GStrv) split = NULL;
 
 	split = g_strsplit (transaction_flags, ";", 0);
diff --git a/lib/packagekit-glib2/pk-client-helper.c b/lib/packagekit-glib2/pk-client-helper.c
index 647b77206..c73063274 100644
--- a/lib/packagekit-glib2/pk-client-helper.c
+++ b/lib/packagekit-glib2/pk-client-helper.c
@@ -380,7 +380,7 @@ pk_client_helper_accept_connection_cb (GIOChannel *source, GIOCondition conditio
 	fd = g_socket_get_fd (child->socket);
 	child->socket_channel = g_io_channel_unix_new (fd);
 	child->socket_channel_source =
-		make_input_source (child->socket_channel, (GSourceFunc) pk_client_helper_copy_conn_cb, child);
+		make_input_source (child->socket_channel, G_SOURCE_FUNC (pk_client_helper_copy_conn_cb), child);
 	/* binary data */
 	status = g_io_channel_set_encoding (child->socket_channel, NULL, &error);
 	if (status != G_IO_STATUS_NORMAL) {
@@ -391,9 +391,9 @@ pk_client_helper_accept_connection_cb (GIOChannel *source, GIOCondition conditio
 
 	/* frontend has data */
 	child->stdout_channel_source =
-		make_input_source (child->stdout_channel, (GSourceFunc) pk_client_helper_copy_stdout_cb, child);
+		make_input_source (child->stdout_channel, G_SOURCE_FUNC (pk_client_helper_copy_stdout_cb), child);
 	child->stderr_channel_source =
-		make_input_source (child->stderr_channel, (GSourceFunc) pk_client_helper_echo_stderr_cb, child);
+		make_input_source (child->stderr_channel, G_SOURCE_FUNC (pk_client_helper_echo_stderr_cb), child);
 	return G_SOURCE_CONTINUE;
 }
 
@@ -537,7 +537,7 @@ pk_client_helper_start_with_socket (PkClientHelper *client_helper,
 	fd = g_socket_get_fd (priv->socket);
 	priv->socket_channel = g_io_channel_unix_new (fd);
 	priv->socket_channel_source =
-		make_input_source (priv->socket_channel, (GSourceFunc) pk_client_helper_accept_connection_cb, client_helper);
+		make_input_source (priv->socket_channel, G_SOURCE_FUNC (pk_client_helper_accept_connection_cb), client_helper);
 	return TRUE;
 }
 
diff --git a/lib/packagekit-glib2/pk-progress-bar.c b/lib/packagekit-glib2/pk-progress-bar.c
index 28d8f5ac2..fc5c8c1cd 100644
--- a/lib/packagekit-glib2/pk-progress-bar.c
+++ b/lib/packagekit-glib2/pk-progress-bar.c
@@ -195,7 +195,7 @@ pk_progress_bar_draw_pulse_bar (PkProgressBar *self)
 		self->priv->pulse_state.position = 1;
 		self->priv->pulse_state.move_forward = TRUE;
 		self->priv->timer_id = g_timeout_add (PK_PROGRESS_BAR_PULSE_TIMEOUT,
-						      (GSourceFunc) pk_progress_bar_pulse_bar, self);
+						      G_SOURCE_FUNC (pk_progress_bar_pulse_bar), self);
 		g_source_set_name_by_id (self->priv->timer_id, "[PkProgressBar] pulse");
 	}
 }
diff --git a/lib/packagekit-glib2/pk-socket-example.c b/lib/packagekit-glib2/pk-socket-example.c
index 053bcf8f4..19f594928 100644
--- a/lib/packagekit-glib2/pk-socket-example.c
+++ b/lib/packagekit-glib2/pk-socket-example.c
@@ -85,7 +85,7 @@ main (void)
 
 	/* socket has data */
 	source = g_socket_create_source (socket, G_IO_IN | G_IO_ERR | G_IO_HUP | G_IO_NVAL, NULL);
-	g_source_set_callback (source, (GSourceFunc) pk_socket_example_accept_connection_cb, loop, NULL);
+	g_source_set_callback (source, G_SOURCE_FUNC (pk_socket_example_accept_connection_cb), loop, NULL);
 	g_source_attach (source, NULL);
 
 	/* send some data */
diff --git a/lib/packagekit-glib2/pk-task.c b/lib/packagekit-glib2/pk-task.c
index fd4b057ae..d4823148f 100644
--- a/lib/packagekit-glib2/pk-task.c
+++ b/lib/packagekit-glib2/pk-task.c
@@ -794,7 +794,7 @@ pk_task_user_accepted (PkTask *task, guint request)
 	}
 
 	idle_source = g_idle_source_new ();
-	g_source_set_callback (idle_source, (GSourceFunc) pk_task_user_accepted_idle_cb, state, NULL);
+	g_source_set_callback (idle_source, G_SOURCE_FUNC (pk_task_user_accepted_idle_cb), state, NULL);
 	g_source_set_name (idle_source, "[PkTask] user-accept");
 	g_source_attach (idle_source, g_main_context_get_thread_default ());
 	return TRUE;
@@ -851,7 +851,7 @@ pk_task_user_declined (PkTask *task, guint request)
 	}
 
 	idle_source = g_idle_source_new ();
-	g_source_set_callback (idle_source, (GSourceFunc) pk_task_user_declined_idle_cb, state, NULL);
+	g_source_set_callback (idle_source, G_SOURCE_FUNC (pk_task_user_declined_idle_cb), state, NULL);
 	g_source_set_name (idle_source, "[PkTask] user-accept");
 	g_source_attach (idle_source, g_main_context_get_thread_default ());
 	return TRUE;
diff --git a/lib/packagekit-glib2/pk-test-daemon.c b/lib/packagekit-glib2/pk-test-daemon.c
index 395204d11..efa762077 100644
--- a/lib/packagekit-glib2/pk-test-daemon.c
+++ b/lib/packagekit-glib2/pk-test-daemon.c
@@ -269,7 +269,7 @@ pk_test_client_helper_func (void)
 
 	/* socket has data */
 	source = g_socket_create_source (socket, G_IO_IN | G_IO_ERR | G_IO_HUP | G_IO_NVAL, NULL);
-	g_source_set_callback (source, (GSourceFunc) pk_test_client_helper_output_cb, NULL, NULL);
+	g_source_set_callback (source, G_SOURCE_FUNC (pk_test_client_helper_output_cb), NULL, NULL);
 	g_source_attach (source, NULL);
 
 	/* send some data */
@@ -677,7 +677,7 @@ pk_test_client_func (void)
 	pk_client_search_names_async (client, pk_bitfield_value (PK_FILTER_ENUM_NONE), values, cancellable,
 		     (PkProgressCallback) pk_test_client_progress_cb, NULL,
 		     (GAsyncReadyCallback) pk_test_client_search_name_cb, NULL);
-	g_timeout_add (500, (GSourceFunc) pk_test_client_cancel_cb, cancellable);
+	g_timeout_add (500, G_SOURCE_FUNC (pk_test_client_cancel_cb), cancellable);
 	_g_test_loop_run_with_timeout (15000);
 	g_debug ("cancelled in %f", g_test_timer_elapsed ());
 
@@ -1403,7 +1403,7 @@ pk_test_transaction_list_func (void)
 	g_debug ("resolved in %f", g_test_timer_elapsed ());
 
 	/* wait for remove */
-	g_timeout_add (100, (GSourceFunc) pk_transaction_list_delay_cb, NULL);
+	g_timeout_add (100, G_SOURCE_FUNC (pk_transaction_list_delay_cb), NULL);
 	_g_test_loop_run_with_timeout (15000);
 	g_debug ("resolved in %f", g_test_timer_elapsed ());
 
diff --git a/meson.build b/meson.build
index 3cdc269e3..70bc95155 100644
--- a/meson.build
+++ b/meson.build
@@ -9,7 +9,7 @@ gnome = import('gnome')
 i18n = import('i18n')
 pkg = import('pkgconfig')
 
-glib_dep = dependency('glib-2.0', version: '>=2.54.0')
+glib_dep = dependency('glib-2.0', version: '>=2.62')
 gobject_dep = dependency('gobject-2.0')
 gio_dep = dependency('gio-2.0')
 gio_unix_dep = dependency('gio-unix-2.0', version: '>=2.16.1')
diff --git a/src/pk-backend-job.h b/src/pk-backend-job.h
index 67ffac692..db7871ff4 100644
--- a/src/pk-backend-job.h
+++ b/src/pk-backend-job.h
@@ -149,6 +149,8 @@ guint		 pk_backend_job_get_cache_age		(PkBackendJob	*job);
 typedef void	 (*PkBackendJobVFunc)			(PkBackendJob	*job,
 							 gpointer	 object,
 							 gpointer	 user_data);
+#define 	PK_BACKEND_JOB_VFUNC(f) ((PkBackendJobVFunc) (void (*)(void)) (f))
+
 void		 pk_backend_job_set_vfunc		(PkBackendJob	*job,
 							 PkBackendJobSignal signal_kind,
 							 PkBackendJobVFunc vfunc,
diff --git a/src/pk-engine.c b/src/pk-engine.c
index 7ea87a448..4a7e38410 100644
--- a/src/pk-engine.c
+++ b/src/pk-engine.c
@@ -1724,14 +1724,14 @@ pk_engine_on_bus_acquired_cb (GDBusConnection *connection,
 	PkEngine *engine = PK_ENGINE (user_data);
 	guint registration_id;
 	static const GDBusInterfaceVTable iface_daemon_vtable = {
-		pk_engine_daemon_method_call,
-		pk_engine_daemon_get_property,
-		NULL
+		.method_call = pk_engine_daemon_method_call,
+		.get_property = pk_engine_daemon_get_property,
+		.set_property = NULL
 	};
 	static const GDBusInterfaceVTable iface_offline_vtable = {
-		pk_engine_offline_method_call,
-		pk_engine_offline_get_property,
-		NULL
+		.method_call = pk_engine_offline_method_call,
+		.get_property = pk_engine_offline_get_property,
+		.set_property = NULL
 	};
 
 	/* save copy for emitting signals */
diff --git a/src/pk-scheduler.c b/src/pk-scheduler.c
index 33395c539..99a30cbb8 100644
--- a/src/pk-scheduler.c
+++ b/src/pk-scheduler.c
@@ -1020,7 +1020,7 @@ static void
 pk_scheduler_init (PkScheduler *scheduler)
 {
 	scheduler->priv = PK_SCHEDULER_GET_PRIVATE (scheduler);
-	scheduler->priv->array = g_ptr_array_new ();
+	scheduler->priv->array = g_ptr_array_new_with_free_func ((GDestroyNotify) pk_scheduler_item_free);
 	scheduler->priv->introspection = pk_load_introspection (PK_DBUS_INTERFACE_TRANSACTION ".xml",
 							    NULL);
 	scheduler->priv->unwedge_id = g_timeout_add_seconds (PK_TRANSACTION_WEDGE_CHECK,
@@ -1042,8 +1042,7 @@ pk_scheduler_finalize (GObject *object)
 	if (scheduler->priv->unwedge_id != 0)
 		g_source_remove (scheduler->priv->unwedge_id);
 
-	g_ptr_array_foreach (scheduler->priv->array, (GFunc) pk_scheduler_item_free, NULL);
-	g_ptr_array_free (scheduler->priv->array, TRUE);
+	g_ptr_array_unref (scheduler->priv->array);
 	g_dbus_node_info_unref (scheduler->priv->introspection);
 	g_key_file_unref (scheduler->priv->conf);
 	if (scheduler->priv->backend != NULL)
diff --git a/src/pk-self-test.c b/src/pk-self-test.c
index 082a70d22..3a37bb872 100644
--- a/src/pk-self-test.c
+++ b/src/pk-self-test.c
@@ -183,11 +183,11 @@ pk_test_backend_func (void)
 	pk_backend_job_set_backend (job, backend);
 	pk_backend_job_set_vfunc (job,
 				  PK_BACKEND_SIGNAL_PACKAGE,
-				  (PkBackendJobVFunc) pk_test_backend_package_cb,
+				  PK_BACKEND_JOB_VFUNC (pk_test_backend_package_cb),
 				  NULL);
 	pk_backend_job_set_vfunc (job,
 				  PK_BACKEND_SIGNAL_FINISHED,
-				  (PkBackendJobVFunc) pk_test_backend_finished_cb,
+				  PK_BACKEND_JOB_VFUNC (pk_test_backend_finished_cb),
 				  NULL);
 
 	/* get eula that does not exist */
@@ -428,13 +428,13 @@ pk_test_backend_spawn_func (void)
 	/* so we can spin until we finish */
 	pk_backend_job_set_vfunc (job,
 				  PK_BACKEND_SIGNAL_FINISHED,
-				  (PkBackendJobVFunc) pk_test_backend_spawn_finished_cb,
+				  PK_BACKEND_JOB_VFUNC (pk_test_backend_spawn_finished_cb),
 				  backend_spawn);
 
 	/* so we can count the returned packages */
 	pk_backend_job_set_vfunc (job,
 				  PK_BACKEND_SIGNAL_PACKAGE,
-				  (PkBackendJobVFunc) pk_test_backend_spawn_package_cb,
+				  PK_BACKEND_JOB_VFUNC (pk_test_backend_spawn_package_cb),
 				  backend_spawn);
 
 	/* test search-name.sh running */
diff --git a/src/pk-transaction.c b/src/pk-transaction.c
index 6167f0473..0724e5f25 100644
--- a/src/pk-transaction.c
+++ b/src/pk-transaction.c
@@ -682,7 +682,7 @@ pk_transaction_distro_upgrade_cb (PkBackendJob *job,
 
 	/* emit */
 	g_debug ("emitting distro-upgrade %s, %s, %s",
-		 pk_distro_upgrade_enum_to_string (state),
+		 pk_update_state_enum_to_string (state),
 		 name, summary);
 	g_dbus_connection_emit_signal (transaction->priv->connection,
 				       NULL,
@@ -1681,83 +1681,83 @@ pk_transaction_run (PkTransaction *transaction)
 	/* connect signal to receive backend lock changes */
 	pk_backend_job_set_vfunc (priv->job,
 				  PK_BACKEND_SIGNAL_LOCKED_CHANGED,
-				  (PkBackendJobVFunc) pk_transaction_locked_changed_cb,
+				  PK_BACKEND_JOB_VFUNC (pk_transaction_locked_changed_cb),
 				  transaction);
 	pk_backend_job_set_vfunc (priv->job,
 				  PK_BACKEND_SIGNAL_ALLOW_CANCEL,
-				  (PkBackendJobVFunc) pk_transaction_allow_cancel_cb,
+				  PK_BACKEND_JOB_VFUNC (pk_transaction_allow_cancel_cb),
 				  transaction);
 	pk_backend_job_set_vfunc (priv->job,
 				  PK_BACKEND_SIGNAL_DETAILS,
-				  (PkBackendJobVFunc) pk_transaction_details_cb,
+				  PK_BACKEND_JOB_VFUNC (pk_transaction_details_cb),
 				  transaction);
 	pk_backend_job_set_vfunc (priv->job,
 				  PK_BACKEND_SIGNAL_ERROR_CODE,
-				  (PkBackendJobVFunc) pk_transaction_error_code_cb,
+				  PK_BACKEND_JOB_VFUNC (pk_transaction_error_code_cb),
 				  transaction);
 	pk_backend_job_set_vfunc (priv->job,
 				  PK_BACKEND_SIGNAL_FILES,
-				  (PkBackendJobVFunc) pk_transaction_files_cb,
+				  PK_BACKEND_JOB_VFUNC (pk_transaction_files_cb),
 				  transaction);
 	pk_backend_job_set_vfunc (priv->job,
 				  PK_BACKEND_SIGNAL_DISTRO_UPGRADE,
-				  (PkBackendJobVFunc) pk_transaction_distro_upgrade_cb,
+				  PK_BACKEND_JOB_VFUNC (pk_transaction_distro_upgrade_cb),
 				  transaction);
 	pk_backend_job_set_vfunc (priv->job,
 				  PK_BACKEND_SIGNAL_FINISHED,
-				  (PkBackendJobVFunc) pk_transaction_finished_cb,
+				  PK_BACKEND_JOB_VFUNC (pk_transaction_finished_cb),
 				  transaction);
 	pk_backend_job_set_vfunc (priv->job,
 				  PK_BACKEND_SIGNAL_PACKAGE,
-				  (PkBackendJobVFunc) pk_transaction_package_cb,
+				  PK_BACKEND_JOB_VFUNC (pk_transaction_package_cb),
 				  transaction);
 	pk_backend_job_set_vfunc (priv->job,
 				  PK_BACKEND_SIGNAL_ITEM_PROGRESS,
-				  (PkBackendJobVFunc) pk_transaction_item_progress_cb,
+				  PK_BACKEND_JOB_VFUNC (pk_transaction_item_progress_cb),
 				  transaction);
 	pk_backend_job_set_vfunc (priv->job,
 				  PK_BACKEND_SIGNAL_PERCENTAGE,
-				  (PkBackendJobVFunc) pk_transaction_percentage_cb,
+				  PK_BACKEND_JOB_VFUNC (pk_transaction_percentage_cb),
 				  transaction);
 	pk_backend_job_set_vfunc (priv->job,
 				  PK_BACKEND_SIGNAL_SPEED,
-				  (PkBackendJobVFunc) pk_transaction_speed_cb,
+				  PK_BACKEND_JOB_VFUNC (pk_transaction_speed_cb),
 				  transaction);
 	pk_backend_job_set_vfunc (priv->job,
 				  PK_BACKEND_SIGNAL_DOWNLOAD_SIZE_REMAINING,
-				  (PkBackendJobVFunc) pk_transaction_download_size_remaining_cb,
+				  PK_BACKEND_JOB_VFUNC (pk_transaction_download_size_remaining_cb),
 				  transaction);
 	pk_backend_job_set_vfunc (priv->job,
 				  PK_BACKEND_SIGNAL_REPO_DETAIL,
-				  (PkBackendJobVFunc) pk_transaction_repo_detail_cb,
+				  PK_BACKEND_JOB_VFUNC (pk_transaction_repo_detail_cb),
 				  transaction);
 	pk_backend_job_set_vfunc (priv->job,
 				  PK_BACKEND_SIGNAL_REPO_SIGNATURE_REQUIRED,
-				  (PkBackendJobVFunc) pk_transaction_repo_signature_required_cb,
+				  PK_BACKEND_JOB_VFUNC (pk_transaction_repo_signature_required_cb),
 				  transaction);
 	pk_backend_job_set_vfunc (priv->job,
 				  PK_BACKEND_SIGNAL_EULA_REQUIRED,
-				  (PkBackendJobVFunc) pk_transaction_eula_required_cb,
+				  PK_BACKEND_JOB_VFUNC (pk_transaction_eula_required_cb),
 				  transaction);
 	pk_backend_job_set_vfunc (priv->job,
 				  PK_BACKEND_SIGNAL_MEDIA_CHANGE_REQUIRED,
-				  (PkBackendJobVFunc) pk_transaction_media_change_required_cb,
+				  PK_BACKEND_JOB_VFUNC (pk_transaction_media_change_required_cb),
 				  transaction);
 	pk_backend_job_set_vfunc (priv->job,
 				  PK_BACKEND_SIGNAL_REQUIRE_RESTART,
-				  (PkBackendJobVFunc) pk_transaction_require_restart_cb,
+				  PK_BACKEND_JOB_VFUNC (pk_transaction_require_restart_cb),
 				  transaction);
 	pk_backend_job_set_vfunc (priv->job,
 				  PK_BACKEND_SIGNAL_STATUS_CHANGED,
-				  (PkBackendJobVFunc) pk_transaction_status_changed_cb,
+				  PK_BACKEND_JOB_VFUNC (pk_transaction_status_changed_cb),
 				  transaction);
 	pk_backend_job_set_vfunc (priv->job,
 				  PK_BACKEND_SIGNAL_UPDATE_DETAIL,
-				  (PkBackendJobVFunc) pk_transaction_update_detail_cb,
+				  PK_BACKEND_JOB_VFUNC (pk_transaction_update_detail_cb),
 				  transaction);
 	pk_backend_job_set_vfunc (priv->job,
 				  PK_BACKEND_SIGNAL_CATEGORY,
-				  (PkBackendJobVFunc) pk_transaction_category_cb,
+				  PK_BACKEND_JOB_VFUNC (pk_transaction_category_cb),
 				  transaction);
 
 	/* do the correct action with the cached parameters */
@@ -5074,9 +5074,9 @@ gboolean
 pk_transaction_set_tid (PkTransaction *transaction, const gchar *tid)
 {
 	static const GDBusInterfaceVTable interface_vtable = {
-		pk_transaction_method_call,
-		pk_transaction_get_property,
-		NULL
+		.method_call = pk_transaction_method_call,
+		.get_property = pk_transaction_get_property,
+		.set_property = NULL
 	};
 
 	g_return_val_if_fail (PK_IS_TRANSACTION (transaction), FALSE);