[PackageKit-commit] packagekit: Branch 'master' - 19 commits
Richard Hughes
hughsient at kemper.freedesktop.org
Thu Jan 14 11:11:14 PST 2010
backends/apt/pk-backend-apt.c | 68
backends/aptcc/apt.cpp | 6
backends/aptcc/pk-backend-aptcc.cpp | 4
backends/conary/pk-backend-conary.c | 42
backends/opkg/pk-backend-opkg.c | 2
backends/pisi/pk-backend-pisi.c | 50
backends/poldek/pk-backend-poldek.c | 2
backends/portage/pk-backend-portage.c | 52
backends/ports/pk-backend-ports.c | 54
backends/slapt/pk-backend-slapt.c | 2
backends/smart/pk-backend-smart.c | 56
backends/test/pk-backend-test-spawn.c | 2
backends/test/pk-backend-test-thread.c | 2
backends/urpmi/pk-backend-urpmi.c | 52
backends/yum/pk-backend-yum.c | 62
backends/zypp/pk-backend-zypp.cpp | 6
client/pk-console.c | 37
client/pk-generate-pack.c | 22
client/pk-monitor.c | 10
contrib/browser-plugin/pk-plugin-install.c | 2
contrib/command-not-found/pk-command-not-found.c | 4
contrib/debuginfo-install/pk-debuginfo-install.c | 10
contrib/pk-completion.bash | 1
lib/packagekit-glib2/Makefile.am | 3
lib/packagekit-glib2/packagekit.h | 1
lib/packagekit-glib2/pk-bitfield.c | 66
lib/packagekit-glib2/pk-bitfield.h | 12
lib/packagekit-glib2/pk-catalog.c | 8
lib/packagekit-glib2/pk-client.c | 104 -
lib/packagekit-glib2/pk-console-shared.c | 6
lib/packagekit-glib2/pk-control.c | 20
lib/packagekit-glib2/pk-desktop.c | 2
lib/packagekit-glib2/pk-enum.c | 164 -
lib/packagekit-glib2/pk-enum.h | 104 -
lib/packagekit-glib2/pk-package-ids.c | 10
lib/packagekit-glib2/pk-package-ids.h | 4
lib/packagekit-glib2/pk-package-sack-sync.c | 168 +
lib/packagekit-glib2/pk-package-sack-sync.h | 41
lib/packagekit-glib2/pk-package-sack.c | 50
lib/packagekit-glib2/pk-package-sack.h | 6
lib/packagekit-glib2/pk-progress.c | 30
lib/packagekit-glib2/pk-results.c | 13
lib/packagekit-glib2/pk-service-pack.c | 2
lib/packagekit-glib2/pk-task-text.c | 16
lib/packagekit-glib2/pk-task-wrapper.c | 8
lib/packagekit-glib2/pk-task.c | 2
lib/packagekit-glib2/pk-transaction-list.c | 8
lib/packagekit-sharp/packagekit-api.raw | 76
lib/packagekit-sharp/packagekit-api.xml | 76
lib/python/packagekit/backend.py | 4
lib/python/packagekit/client.py | 6
po/zh_CN.po | 2337 ++++++++++++++++++++---
src/pk-backend-spawn.c | 22
src/pk-backend.c | 26
src/pk-backend.h | 2
src/pk-engine.c | 14
src/pk-lsof.c | 12
src/pk-network-stack-connman.c | 4
src/pk-network-stack-nm.c | 4
src/pk-network-stack-unix.c | 2
src/pk-network.c | 2
src/pk-polkit-action-lookup.c | 8
src/pk-proc.c | 8
src/pk-shared.c | 8
src/pk-shared.h | 4
src/pk-spawn.c | 6
src/pk-transaction-db.c | 8
src/pk-transaction-extra.c | 28
src/pk-transaction-list.c | 2
src/pk-transaction.c | 138 -
70 files changed, 3137 insertions(+), 1056 deletions(-)
New commits:
commit 149252ee88454eb602a98ed43869a5f0fb70dafb
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Jan 14 10:16:17 2010 +0000
trivial: add install-local to the bash autocompletion rules
diff --git a/contrib/pk-completion.bash b/contrib/pk-completion.bash
index 732f7eb..79c9983 100755
--- a/contrib/pk-completion.bash
+++ b/contrib/pk-completion.bash
@@ -37,6 +37,7 @@ __pkcon_commandlist="
list-diff
list-install
install
+ install-local
refresh
remove
repo-disable
commit 4b71f550ec7dd3dd639ea14784697680e9ddbe94
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Jan 14 10:14:59 2010 +0000
If the user uses 'pkcon install dave.rpm' then give a useful error message
diff --git a/client/pk-console.c b/client/pk-console.c
index 9ba71af..be10db8 100644
--- a/client/pk-console.c
+++ b/client/pk-console.c
@@ -831,8 +831,19 @@ static gboolean
pk_console_install_packages (gchar **packages, GError **error)
{
gboolean ret = TRUE;
- gchar **package_ids;
+ gchar **package_ids = NULL;
GError *error_local = NULL;
+ guint i;
+
+ /* test to see if we've been given files, not packages */
+ for (i=0; packages[i] != NULL; i++) {
+ ret = !g_file_test (packages[i], G_FILE_TEST_EXISTS);
+ if (!ret) {
+ /* TRANSLATORS: The user used 'pkcon install dave.rpm' rather than 'pkcon install-local dave.rpm' */
+ *error = g_error_new (1, 0, _("Extected package name, actually got file. Try using 'pkcon install-local %s' instead."), packages[i]);
+ goto out;
+ }
+ }
package_ids = pk_console_resolve_packages (PK_CLIENT(task), pk_bitfield_value (PK_FILTER_ENUM_NOT_INSTALLED), packages, &error_local);
if (package_ids == NULL) {
commit 2bbc11bc42373310604992f961061ea6201b3ec9
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Jan 14 10:08:55 2010 +0000
Ensure that pkgenpack generates filenames without ';' embedded in them
diff --git a/client/pk-generate-pack.c b/client/pk-generate-pack.c
index ba5bedc..5cba199 100644
--- a/client/pk-generate-pack.c
+++ b/client/pk-generate-pack.c
@@ -64,6 +64,9 @@ pk_generate_pack_get_filename (const gchar *name, const gchar *directory)
"distro-id", &distro_id,
NULL);
+ /* delimit with nicer chars then ';' */
+ g_strdelimit (distro_id, ";", '-');
+
if (name != NULL) {
filename = g_strdup_printf ("%s/%s-%s.%s", directory, name, distro_id, PK_SERVICE_PACK_FILE_EXTENSION);
} else {
commit bc6218abc7d52f4af04c4ad06a84cfa96a23786f
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Jan 14 10:05:23 2010 +0000
Show the translated role and status when using pkgenpack
diff --git a/client/pk-generate-pack.c b/client/pk-generate-pack.c
index f9d2059..ba5bedc 100644
--- a/client/pk-generate-pack.c
+++ b/client/pk-generate-pack.c
@@ -84,7 +84,20 @@ static void
pk_generate_pack_progress_cb (PkProgress *progress, PkProgressType type, gpointer data)
{
gint percentage;
+ PkRoleEnum role;
PkStatusEnum status;
+ const gchar *text;
+
+ /* role */
+ if (type == PK_PROGRESS_TYPE_ROLE) {
+ g_object_get (progress,
+ "role", &role,
+ NULL);
+
+ /* show new role on the bar */
+ text = pk_role_enum_to_localised_present (role);
+ pk_progress_bar_start (progressbar, text);
+ }
/* percentage */
if (type == PK_PROGRESS_TYPE_PERCENTAGE) {
@@ -101,8 +114,10 @@ pk_generate_pack_progress_cb (PkProgress *progress, PkProgressType type, gpointe
NULL);
if (status == PK_STATUS_ENUM_FINISHED)
return;
- /* TODO: translate */
- pk_progress_bar_start (progressbar, pk_status_enum_to_string (status));
+
+ /* show status on the bar */
+ text = pk_status_enum_to_localised_text (status);
+ pk_progress_bar_start (progressbar, text);
}
}
commit 0f3b83cf400e1f7eaf33758088488297ccea6438
Author: Richard Hughes <richard at hughsie.com>
Date: Tue Jan 12 12:41:53 2010 +0000
trivial: rename foo_[to|from]_text to foo_[to|from}_string functions, to fit in more with coding standards
Also add in compatibility defines for applications using packagekit-glib2.
This looks like a large commit, but it's actually just a search-replace script.
diff --git a/backends/apt/pk-backend-apt.c b/backends/apt/pk-backend-apt.c
index 1370c78..f010b78 100644
--- a/backends/apt/pk-backend-apt.c
+++ b/backends/apt/pk-backend-apt.c
@@ -99,7 +99,7 @@ backend_download_packages (PkBackend *backend, gchar **package_ids, const gchar
gchar *package_ids_temp;
/* send the complete list as stdin */
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, "aptBackend.py", "download-packages", directory, package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -112,9 +112,9 @@ backend_get_depends (PkBackend *backend, PkBitfield filters, gchar **package_ids
{
gchar *filters_text;
gchar *package_ids_temp;
- package_ids_temp = pk_package_ids_to_text (package_ids);
- filters_text = pk_filter_bitfield_to_text (filters);
- pk_backend_spawn_helper (spawn, "aptBackend.py", "get-depends", filters_text, package_ids_temp, pk_backend_bool_to_text (recursive), NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ filters_text = pk_filter_bitfield_to_string (filters);
+ pk_backend_spawn_helper (spawn, "aptBackend.py", "get-depends", filters_text, package_ids_temp, pk_backend_bool_to_string (recursive), NULL);
g_free (filters_text);
g_free (package_ids_temp);
}
@@ -126,7 +126,7 @@ static void
backend_get_details (PkBackend *backend, gchar **package_ids)
{
gchar *package_ids_temp;
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, "aptBackend.py", "get-details", package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -149,7 +149,7 @@ static void
backend_get_files (PkBackend *backend, gchar **package_ids)
{
gchar *package_ids_temp;
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, "aptBackend.py", "get-files", package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -162,9 +162,9 @@ backend_get_requires (PkBackend *backend, PkBitfield filters, gchar **package_id
{
gchar *package_ids_temp;
gchar *filters_text;
- package_ids_temp = pk_package_ids_to_text (package_ids);
- filters_text = pk_filter_bitfield_to_text (filters);
- pk_backend_spawn_helper (spawn, "aptBackend.py", "get-requires", filters_text, package_ids_temp, pk_backend_bool_to_text (recursive), NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ filters_text = pk_filter_bitfield_to_string (filters);
+ pk_backend_spawn_helper (spawn, "aptBackend.py", "get-requires", filters_text, package_ids_temp, pk_backend_bool_to_string (recursive), NULL);
g_free (filters_text);
g_free (package_ids_temp);
}
@@ -176,7 +176,7 @@ static void
backend_get_updates (PkBackend *backend, PkBitfield filters)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, "aptBackend.py", "get-updates", filters_text, NULL);
g_free (filters_text);
}
@@ -188,7 +188,7 @@ static void
backend_get_packages (PkBackend *backend, PkBitfield filters)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, "aptBackend.py", "get-packages", filters_text, NULL);
g_free (filters_text);
}
@@ -200,7 +200,7 @@ static void
backend_get_update_detail (PkBackend *backend, gchar **package_ids)
{
gchar *package_ids_temp;
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, "aptBackend.py", "get-update-detail", package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -228,7 +228,7 @@ backend_simulate_install_packages (PkBackend *backend, gchar **package_ids)
gchar *package_ids_temp;
/* send the complete list as stdin */
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, "aptBackend.py", "simulate-install-packages", package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -242,7 +242,7 @@ backend_simulate_remove_packages (PkBackend *backend, gchar **package_ids)
gchar *package_ids_temp;
/* send the complete list as stdin */
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, "aptBackend.py", "simulate-remove-packages", package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -256,7 +256,7 @@ backend_simulate_update_packages (PkBackend *backend, gchar **package_ids)
gchar *package_ids_temp;
/* send the complete list as stdin */
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, "aptBackend.py", "simulate-update-packages", package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -270,8 +270,8 @@ backend_install_packages (PkBackend *backend, gboolean only_trusted, gchar **pac
gchar *package_ids_temp;
/* send the complete list as stdin */
- package_ids_temp = pk_package_ids_to_text (package_ids);
- pk_backend_spawn_helper (spawn, "aptBackend.py", "install-packages", pk_backend_bool_to_text (only_trusted), package_ids_temp, NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ pk_backend_spawn_helper (spawn, "aptBackend.py", "install-packages", pk_backend_bool_to_string (only_trusted), package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -285,7 +285,7 @@ backend_install_files (PkBackend *backend, gboolean only_trusted, gchar **full_p
/* send the complete list as stdin */
package_ids_temp = g_strjoinv (PK_BACKEND_SPAWN_FILENAME_DELIM, full_paths);
- pk_backend_spawn_helper (spawn, "aptBackend.py", "install-files", pk_backend_bool_to_text (only_trusted), package_ids_temp, NULL);
+ pk_backend_spawn_helper (spawn, "aptBackend.py", "install-files", pk_backend_bool_to_string (only_trusted), package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -300,7 +300,7 @@ backend_install_signature (PkBackend *backend, PkSigTypeEnum type,
{
const gchar *type_text;
- type_text = pk_sig_type_enum_to_text (type);
+ type_text = pk_sig_type_enum_to_string (type);
pk_backend_spawn_helper (spawn, "aptBackend.py", "install-signature", type_text, key_id, package_id, NULL);
} */
@@ -310,7 +310,7 @@ backend_install_signature (PkBackend *backend, PkSigTypeEnum type,
static void
backend_refresh_cache (PkBackend *backend, gboolean force)
{
- pk_backend_spawn_helper (spawn, "aptBackend.py", "refresh-cache", pk_backend_bool_to_text (force), NULL);
+ pk_backend_spawn_helper (spawn, "aptBackend.py", "refresh-cache", pk_backend_bool_to_string (force), NULL);
}
/**
@@ -322,8 +322,8 @@ backend_remove_packages (PkBackend *backend, gchar **package_ids, gboolean allow
gchar *package_ids_temp;
/* send the complete list as stdin */
- package_ids_temp = pk_package_ids_to_text (package_ids);
- pk_backend_spawn_helper (spawn, "aptBackend.py", "remove-packages", pk_backend_bool_to_text (allow_deps), pk_backend_bool_to_text (autoremove), package_ids_temp, NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ pk_backend_spawn_helper (spawn, "aptBackend.py", "remove-packages", pk_backend_bool_to_string (allow_deps), pk_backend_bool_to_string (autoremove), package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -334,7 +334,7 @@ static void
backend_search_details (PkBackend *backend, PkBitfield filters, const gchar *search)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, "aptBackend.py", "search-details", filters_text, search, NULL);
g_free (filters_text);
}
@@ -346,7 +346,7 @@ static void
backend_search_file (PkBackend *backend, PkBitfield filters, const gchar *search)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, "aptBackend.py", "search-file", filters_text, search, NULL);
g_free (filters_text);
}
@@ -358,7 +358,7 @@ static void
backend_search_group (PkBackend *backend, PkBitfield filters, const gchar *search)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, "aptBackend.py", "search-group", filters_text, search, NULL);
g_free (filters_text);
}
@@ -370,7 +370,7 @@ static void
backend_search_name (PkBackend *backend, PkBitfield filters, const gchar *search)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, "aptBackend.py", "search-name", filters_text, search, NULL);
g_free (filters_text);
}
@@ -384,8 +384,8 @@ backend_update_packages (PkBackend *backend, gboolean only_trusted, gchar **pack
gchar *package_ids_temp;
/* send the complete list as stdin */
- package_ids_temp = pk_package_ids_to_text (package_ids);
- pk_backend_spawn_helper (spawn, "aptBackend.py", "update-packages", pk_backend_bool_to_text (only_trusted), package_ids_temp, NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ pk_backend_spawn_helper (spawn, "aptBackend.py", "update-packages", pk_backend_bool_to_string (only_trusted), package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -395,7 +395,7 @@ backend_update_packages (PkBackend *backend, gboolean only_trusted, gchar **pack
static void
backend_update_system (PkBackend *backend, gboolean only_trusted)
{
- pk_backend_spawn_helper (spawn, "aptBackend.py", "update-system", pk_backend_bool_to_text (only_trusted), NULL);
+ pk_backend_spawn_helper (spawn, "aptBackend.py", "update-system", pk_backend_bool_to_string (only_trusted), NULL);
}
/**
@@ -406,8 +406,8 @@ backend_resolve (PkBackend *backend, PkBitfield filters, gchar **package_ids)
{
gchar *filters_text;
gchar *package_ids_temp;
- filters_text = pk_filter_bitfield_to_text (filters);
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ filters_text = pk_filter_bitfield_to_string (filters);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, "aptBackend.py", "resolve", filters_text, package_ids_temp, NULL);
g_free (filters_text);
g_free (package_ids_temp);
@@ -421,7 +421,7 @@ static void
backend_get_repo_list (PkBackend *backend, PkBitfield filters)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, "aptBackend.py", "get-repo-list", filters_text, NULL);
g_free (filters_text);
}
@@ -460,8 +460,8 @@ backend_what_provides (PkBackend *backend, PkBitfield filters, PkProvidesEnum pr
{
gchar *filters_text;
const gchar *provides_text;
- provides_text = pk_provides_enum_to_text (provides);
- filters_text = pk_filter_bitfield_to_text (filters);
+ provides_text = pk_provides_enum_to_string (provides);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, "aptBackend.py", "what-provides", filters_text, provides_text, search, NULL);
g_free (filters_text);
}
diff --git a/backends/aptcc/pk-backend-aptcc.cpp b/backends/aptcc/pk-backend-aptcc.cpp
index e2170d5..6b09ff0 100644
--- a/backends/aptcc/pk-backend-aptcc.cpp
+++ b/backends/aptcc/pk-backend-aptcc.cpp
@@ -521,7 +521,7 @@ backend_what_provides_thread (PkBackend *backend)
delete m_apt;
} else {
- provides_text = pk_provides_enum_to_text (provides);
+ provides_text = pk_provides_enum_to_string (provides);
pk_backend_error_code (backend,
PK_ERROR_ENUM_NOT_SUPPORTED,
"Provides %s not supported",
@@ -900,7 +900,7 @@ backend_search_groups_thread (PkBackend *backend)
pk_backend_finished (backend);
return false;
} else {
- groups.push_back(pk_group_enum_from_text(values[i]));
+ groups.push_back(pk_group_enum_from_string(values[i]));
}
}
diff --git a/backends/conary/pk-backend-conary.c b/backends/conary/pk-backend-conary.c
index 3168976..d86f767 100644
--- a/backends/conary/pk-backend-conary.c
+++ b/backends/conary/pk-backend-conary.c
@@ -95,7 +95,7 @@ static void
backend_get_details (PkBackend *backend, gchar **package_ids)
{
gchar *package_ids_temp;
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, "conaryBackend.py", "get-details", package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -107,7 +107,7 @@ static void
backend_get_files (PkBackend *backend, gchar **package_ids)
{
gchar *package_ids_temp;
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, "conaryBackend.py", "get-files", package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -119,7 +119,7 @@ static void
backend_get_updates (PkBackend *backend, PkBitfield filters)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, "conaryBackend.py", "get-updates", filters_text, NULL);
g_free (filters_text);
}
@@ -131,7 +131,7 @@ static void
backend_get_update_detail (PkBackend *backend, gchar **package_ids)
{
gchar *package_ids_temp;
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, "conaryBackend.py", "get-update-detail", package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -152,8 +152,8 @@ backend_install_packages (PkBackend *backend, gboolean only_trusted, gchar **pac
}
/* send the complete list as stdin */
- package_ids_temp = pk_package_ids_to_text (package_ids);
- pk_backend_spawn_helper (spawn, "conaryBackend.py", "install-packages", pk_backend_bool_to_text (only_trusted), package_ids_temp, NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ pk_backend_spawn_helper (spawn, "conaryBackend.py", "install-packages", pk_backend_bool_to_string (only_trusted), package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -166,8 +166,8 @@ backend_install_files (PkBackend *backend, gboolean only_trusted, const gchar *f
{
gchar *package_ids_temp;
- package_ids_temp = pk_package_ids_to_text (package_ids);
- pk_backend_spawn_helper (spawn, "conaryBackend.py", "install-files", pk_backend_bool_to_text (only_trusted), full_paths, NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ pk_backend_spawn_helper (spawn, "conaryBackend.py", "install-files", pk_backend_bool_to_string (only_trusted), full_paths, NULL);
g_free (package_ids_temp);
}
*/
@@ -185,7 +185,7 @@ backend_refresh_cache (PkBackend *backend, gboolean force)
return;
}
- pk_backend_spawn_helper (spawn, "conaryBackend.py", "refresh-cache", pk_backend_bool_to_text (force), NULL);
+ pk_backend_spawn_helper (spawn, "conaryBackend.py", "refresh-cache", pk_backend_bool_to_string (force), NULL);
}
/**
@@ -203,8 +203,8 @@ backend_remove_packages (PkBackend *backend, gchar **package_ids, gboolean allow
gchar *package_ids_temp;
/* send the complete list as stdin */
- package_ids_temp = pk_package_ids_to_text (package_ids);
- pk_backend_spawn_helper (spawn, "conaryBackend.py", "remove-packages", pk_backend_bool_to_text (allow_deps), pk_backend_bool_to_text (autoremove), package_ids_temp, NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ pk_backend_spawn_helper (spawn, "conaryBackend.py", "remove-packages", pk_backend_bool_to_string (allow_deps), pk_backend_bool_to_string (autoremove), package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -215,7 +215,7 @@ static void
backend_search_name (PkBackend *backend, PkBitfield filters, const gchar *search)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, "conaryBackend.py", "search-name", filters_text, search, NULL);
g_free (filters_text);
}
@@ -226,7 +226,7 @@ static void
backend_search_group (PkBackend *backend, PkBitfield filters, const gchar *search)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, "conaryBackend.py", "search-group", filters_text, search, NULL);
g_free (filters_text);
}
@@ -241,7 +241,7 @@ static void
backend_search_details (PkBackend *backend, PkBitfield filters, const gchar *search)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, "conaryBackend.py", "search-details", filters_text, search, NULL);
g_free (filters_text);
}
@@ -261,9 +261,9 @@ backend_update_packages (PkBackend *backend, gboolean only_trusted, gchar **pack
return;
}
/* send the complete list as stdin */
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
egg_debug("Updates Packages");
- pk_backend_spawn_helper (spawn, "conaryBackend.py", "update-packages", pk_backend_bool_to_text (only_trusted), package_ids_temp, NULL);
+ pk_backend_spawn_helper (spawn, "conaryBackend.py", "update-packages", pk_backend_bool_to_string (only_trusted), package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -273,7 +273,7 @@ backend_update_packages (PkBackend *backend, gboolean only_trusted, gchar **pack
static void
backend_update_system (PkBackend *backend, gboolean only_trusted)
{
- pk_backend_spawn_helper (spawn, "conaryBackend.py", "update-system", pk_backend_bool_to_text (only_trusted), NULL);
+ pk_backend_spawn_helper (spawn, "conaryBackend.py", "update-system", pk_backend_bool_to_string (only_trusted), NULL);
}
/**
@@ -297,7 +297,7 @@ static void
backend_resolve (PkBackend *backend, PkBitfield filters, gchar **package_ids)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, "conaryBackend.py", "resolve", filters_text, package_ids[0], NULL);
g_free (filters_text);
}
@@ -310,7 +310,7 @@ static void
backend_get_packages (PkBackend *backend, PkBitfield filters)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, "conaryBackend.py", "get-packages", filters_text, NULL);
g_free (filters_text);
}
@@ -321,7 +321,7 @@ static void
backend_search_file (PkBackend *backend, PkBitfield filters, const gchar *search)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, "conaryBackend.py", "search-file", filters_text, search, NULL);
g_free (filters_text);
}
@@ -344,7 +344,7 @@ static void
backend_get_repo_list (PkBackend *backend, PkBitfield filters)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, "conaryBackend.py", "get-repo-list", filters_text, NULL);
g_free (filters_text);
}
diff --git a/backends/opkg/pk-backend-opkg.c b/backends/opkg/pk-backend-opkg.c
index 9fb7adb..a624437 100644
--- a/backends/opkg/pk-backend-opkg.c
+++ b/backends/opkg/pk-backend-opkg.c
@@ -701,7 +701,7 @@ backend_get_details_thread (PkBackend *backend)
for (group_index = 0; group < PK_GROUP_ENUM_LAST; group_index++) {
group = 1 << group_index;
if (!(group & backend_get_groups(backend))) continue;
- if (opkg_check_tag(pkg, (const gchar *)pk_group_enum_to_text(group)))
+ if (opkg_check_tag(pkg, (const gchar *)pk_group_enum_to_string(group)))
break;
}
}
diff --git a/backends/pisi/pk-backend-pisi.c b/backends/pisi/pk-backend-pisi.c
index 62a0b69..b634389 100644
--- a/backends/pisi/pk-backend-pisi.c
+++ b/backends/pisi/pk-backend-pisi.c
@@ -108,9 +108,9 @@ backend_get_depends (PkBackend *backend, PkBitfield filters, gchar **package_ids
{
gchar *filters_text;
gchar *package_ids_temp;
- package_ids_temp = pk_package_ids_to_text (package_ids);
- filters_text = pk_filter_bitfield_to_text (filters);
- pk_backend_spawn_helper (spawn, "pisiBackend.py", "get-depends", filters_text, package_ids_temp, pk_backend_bool_to_text (recursive), NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ filters_text = pk_filter_bitfield_to_string (filters);
+ pk_backend_spawn_helper (spawn, "pisiBackend.py", "get-depends", filters_text, package_ids_temp, pk_backend_bool_to_string (recursive), NULL);
g_free (filters_text);
g_free (package_ids_temp);
}
@@ -122,7 +122,7 @@ static void
backend_get_details (PkBackend *backend, gchar **package_ids)
{
gchar *package_ids_temp;
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, "pisiBackend.py", "get-details", package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -134,7 +134,7 @@ static void
backend_get_files (PkBackend *backend, gchar **package_ids)
{
gchar *package_ids_temp;
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, "pisiBackend.py", "get-files", package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -147,9 +147,9 @@ backend_get_requires (PkBackend *backend, PkBitfield filters, gchar **package_id
{
gchar *filters_text;
gchar *package_ids_temp;
- package_ids_temp = pk_package_ids_to_text (package_ids);
- filters_text = pk_filter_bitfield_to_text (filters);
- pk_backend_spawn_helper (spawn, "pisiBackend.py", "get-requires", filters_text, package_ids_temp, pk_backend_bool_to_text (recursive), NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ filters_text = pk_filter_bitfield_to_string (filters);
+ pk_backend_spawn_helper (spawn, "pisiBackend.py", "get-requires", filters_text, package_ids_temp, pk_backend_bool_to_string (recursive), NULL);
g_free (filters_text);
g_free (package_ids_temp);
}
@@ -161,7 +161,7 @@ static void
backend_get_updates (PkBackend *backend, PkBitfield filters)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, "pisiBackend.py", "get-updates", filters_text, NULL);
g_free (filters_text);
}
@@ -182,8 +182,8 @@ backend_install_packages (PkBackend *backend, gboolean only_trusted, gchar **pac
}
/* send the complete list as stdin */
- package_ids_temp = pk_package_ids_to_text (package_ids);
- pk_backend_spawn_helper (spawn, "pisiBackend.py", "install-packages", pk_backend_bool_to_text (only_trusted), package_ids_temp, NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ pk_backend_spawn_helper (spawn, "pisiBackend.py", "install-packages", pk_backend_bool_to_string (only_trusted), package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -197,7 +197,7 @@ backend_install_files (PkBackend *backend, gboolean only_trusted, gchar **full_p
/* send the complete list as stdin */
package_ids_temp = g_strjoinv (PK_BACKEND_SPAWN_FILENAME_DELIM, full_paths);
- pk_backend_spawn_helper (spawn, "pisiBackend.py", "install-files", pk_backend_bool_to_text (only_trusted), package_ids_temp, NULL);
+ pk_backend_spawn_helper (spawn, "pisiBackend.py", "install-files", pk_backend_bool_to_string (only_trusted), package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -214,7 +214,7 @@ backend_refresh_cache (PkBackend *backend, gboolean force)
return;
}
- pk_backend_spawn_helper (spawn, "pisiBackend.py", "refresh-cache", pk_backend_bool_to_text (force), NULL);
+ pk_backend_spawn_helper (spawn, "pisiBackend.py", "refresh-cache", pk_backend_bool_to_string (force), NULL);
}
/**
@@ -226,8 +226,8 @@ backend_remove_packages (PkBackend *backend, gchar **package_ids, gboolean allow
gchar *package_ids_temp;
/* send the complete list as stdin */
- package_ids_temp = pk_package_ids_to_text (package_ids);
- pk_backend_spawn_helper (spawn, "pisiBackend.py", "remove-packages", pk_backend_bool_to_text (allow_deps), pk_backend_bool_to_text (autoremove), package_ids_temp, NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ pk_backend_spawn_helper (spawn, "pisiBackend.py", "remove-packages", pk_backend_bool_to_string (allow_deps), pk_backend_bool_to_string (autoremove), package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -238,7 +238,7 @@ static void
backend_search_details (PkBackend *backend, PkBitfield filters, const gchar *search)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, "pisiBackend.py", "search-details", filters_text, search, NULL);
g_free (filters_text);
}
@@ -250,7 +250,7 @@ static void
backend_search_file (PkBackend *backend, PkBitfield filters, const gchar *search)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, "pisiBackend.py", "search-file", filters_text, search, NULL);
g_free (filters_text);
}
@@ -262,7 +262,7 @@ static void
backend_search_group (PkBackend *backend, PkBitfield filters, const gchar *search)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, "pisiBackend.py", "search-group", filters_text, search, NULL);
g_free (filters_text);
}
@@ -274,7 +274,7 @@ static void
backend_search_name (PkBackend *backend, PkBitfield filters, const gchar *search)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, "pisiBackend.py", "search-name", filters_text, search, NULL);
g_free (filters_text);
}
@@ -295,8 +295,8 @@ backend_update_packages (PkBackend *backend, gboolean only_trusted, gchar **pack
}
/* send the complete list as stdin */
- package_ids_temp = pk_package_ids_to_text (package_ids);
- pk_backend_spawn_helper (spawn, "pisiBackend.py", "update-packages", pk_backend_bool_to_text (only_trusted), package_ids_temp, NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ pk_backend_spawn_helper (spawn, "pisiBackend.py", "update-packages", pk_backend_bool_to_string (only_trusted), package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -306,7 +306,7 @@ backend_update_packages (PkBackend *backend, gboolean only_trusted, gchar **pack
static void
backend_update_system (PkBackend *backend, gboolean only_trusted)
{
- pk_backend_spawn_helper (spawn, "pisiBackend.py", "update-system", pk_backend_bool_to_text (only_trusted), NULL);
+ pk_backend_spawn_helper (spawn, "pisiBackend.py", "update-system", pk_backend_bool_to_string (only_trusted), NULL);
}
/**
@@ -317,8 +317,8 @@ backend_resolve (PkBackend *backend, PkBitfield filters, gchar **package_ids)
{
gchar *filters_text;
gchar *package_ids_temp;
- filters_text = pk_filter_bitfield_to_text (filters);
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ filters_text = pk_filter_bitfield_to_string (filters);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, "pisiBackend.py", "resolve", filters_text, package_ids_temp, NULL);
g_free (filters_text);
g_free (package_ids_temp);
@@ -331,7 +331,7 @@ static void
backend_get_repo_list (PkBackend *backend, PkBitfield filters)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, "pisiBackend.py", "get-repo-list", filters_text, NULL);
g_free (filters_text);
}
diff --git a/backends/poldek/pk-backend-poldek.c b/backends/poldek/pk-backend-poldek.c
index ac84bbe..645c2da 100644
--- a/backends/poldek/pk-backend-poldek.c
+++ b/backends/poldek/pk-backend-poldek.c
@@ -1552,7 +1552,7 @@ search_package_thread (PkBackend *backend)
search = pk_backend_get_string (backend, "search");
- group = pk_group_enum_from_text (search);
+ group = pk_group_enum_from_string (search);
regex = pld_group_get_regex_from_enum (group);
search_cmd_installed = g_strdup_printf ("search -qg --perlre %s", regex);
diff --git a/backends/portage/pk-backend-portage.c b/backends/portage/pk-backend-portage.c
index ab92f1f..200ddc3 100644
--- a/backends/portage/pk-backend-portage.c
+++ b/backends/portage/pk-backend-portage.c
@@ -135,9 +135,9 @@ backend_get_depends (PkBackend *backend, PkBitfield filters, gchar **package_ids
gchar *filters_text;
gchar *package_ids_temp;
- package_ids_temp = pk_package_ids_to_text (package_ids);
- filters_text = pk_filter_bitfield_to_text (filters);
- pk_backend_spawn_helper (spawn, BACKEND_FILE, "get-depends", filters_text, package_ids_temp, pk_backend_bool_to_text (recursive), NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ filters_text = pk_filter_bitfield_to_string (filters);
+ pk_backend_spawn_helper (spawn, BACKEND_FILE, "get-depends", filters_text, package_ids_temp, pk_backend_bool_to_string (recursive), NULL);
g_free (package_ids_temp);
g_free (filters_text);
}
@@ -150,7 +150,7 @@ backend_get_details (PkBackend *backend, gchar **package_ids)
{
gchar *package_ids_temp;
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "get-details", package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -163,7 +163,7 @@ backend_get_files (PkBackend *backend, gchar **package_ids)
{
gchar *package_ids_temp;
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "get-files", package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -176,7 +176,7 @@ backend_get_update_detail (PkBackend *backend, gchar **package_ids)
{
gchar *package_ids_temp;
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "get-update-detail", package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -189,7 +189,7 @@ backend_get_updates (PkBackend *backend, PkBitfield filters)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "get-updates", filters_text, NULL);
g_free (filters_text);
}
@@ -210,8 +210,8 @@ backend_install_packages (PkBackend *backend, gboolean only_trusted, gchar **pac
*/
/* send the complete list as stdin */
- package_ids_temp = pk_package_ids_to_text (package_ids);
- pk_backend_spawn_helper (spawn, BACKEND_FILE, "install-packages", pk_backend_bool_to_text (only_trusted), package_ids_temp, NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ pk_backend_spawn_helper (spawn, BACKEND_FILE, "install-packages", pk_backend_bool_to_string (only_trusted), package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -228,7 +228,7 @@ backend_refresh_cache (PkBackend *backend, gboolean force)
return;
}
- pk_backend_spawn_helper (spawn, BACKEND_FILE, "refresh-cache", pk_backend_bool_to_text (force), NULL);
+ pk_backend_spawn_helper (spawn, BACKEND_FILE, "refresh-cache", pk_backend_bool_to_string (force), NULL);
}
/**
@@ -239,8 +239,8 @@ backend_remove_packages (PkBackend *backend, gchar **package_ids, gboolean allow
{
gchar *package_ids_temp;
- package_ids_temp = pk_package_ids_to_text (package_ids);
- pk_backend_spawn_helper (spawn, BACKEND_FILE, "remove-packages", pk_backend_bool_to_text (allow_deps), pk_backend_bool_to_text (autoremove), package_ids_temp, NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ pk_backend_spawn_helper (spawn, BACKEND_FILE, "remove-packages", pk_backend_bool_to_string (allow_deps), pk_backend_bool_to_string (autoremove), package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -250,7 +250,7 @@ backend_remove_packages (PkBackend *backend, gchar **package_ids, gboolean allow
static void
backend_repo_enable (PkBackend *backend, const gchar *rid, gboolean enabled)
{
- pk_backend_spawn_helper (spawn, BACKEND_FILE, "repo-enable", rid, pk_backend_bool_to_text (enabled), NULL);
+ pk_backend_spawn_helper (spawn, BACKEND_FILE, "repo-enable", rid, pk_backend_bool_to_string (enabled), NULL);
}
/**
@@ -262,8 +262,8 @@ backend_resolve (PkBackend *backend, PkBitfield filters, gchar **package_ids)
gchar *filters_text;
gchar *package_ids_temp;
- filters_text = pk_filter_bitfield_to_text (filters);
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ filters_text = pk_filter_bitfield_to_string (filters);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "resolve", filters_text, package_ids_temp, NULL);
g_free (package_ids_temp);
g_free (filters_text);
@@ -277,7 +277,7 @@ backend_search_details (PkBackend *backend, PkBitfield filters, const gchar *sea
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "search-details", filters_text, search, NULL);
g_free (filters_text);
}
@@ -290,7 +290,7 @@ backend_search_file (PkBackend *backend, PkBitfield filters, const gchar *search
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "search-file", filters_text, search, NULL);
g_free (filters_text);
}
@@ -303,7 +303,7 @@ backend_search_group (PkBackend *backend, PkBitfield filters, const gchar *searc
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "search-group", filters_text, search, NULL);
g_free (filters_text);
}
@@ -316,7 +316,7 @@ backend_search_name (PkBackend *backend, PkBitfield filters, const gchar *search
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "search-name", filters_text, search, NULL);
g_free (filters_text);
}
@@ -330,7 +330,7 @@ backend_update_packages (PkBackend *backend, gboolean only_trusted, gchar **pack
gchar *package_ids_temp;
/* send the complete list as stdin */
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "update-packages", package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -343,7 +343,7 @@ backend_get_packages (PkBackend *backend, PkBitfield filters)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "get-packages", filters_text, NULL);
g_free (filters_text);
}
@@ -356,7 +356,7 @@ backend_get_repo_list (PkBackend *backend, PkBitfield filters)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "get-repo-list", filters_text, NULL);
g_free (filters_text);
}
@@ -370,9 +370,9 @@ backend_get_requires (PkBackend *backend, PkBitfield filters, gchar **package_id
gchar *package_ids_temp;
gchar *filters_text;
- package_ids_temp = pk_package_ids_to_text (package_ids);
- filters_text = pk_filter_bitfield_to_text (filters);
- pk_backend_spawn_helper (spawn, BACKEND_FILE, "get-requires", filters_text, package_ids_temp, pk_backend_bool_to_text (recursive), NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ filters_text = pk_filter_bitfield_to_string (filters);
+ pk_backend_spawn_helper (spawn, BACKEND_FILE, "get-requires", filters_text, package_ids_temp, pk_backend_bool_to_string (recursive), NULL);
g_free (filters_text);
g_free (package_ids_temp);
}
@@ -383,7 +383,7 @@ backend_get_requires (PkBackend *backend, PkBitfield filters, gchar **package_id
static void
backend_update_system (PkBackend *backend, gboolean only_trusted)
{
- pk_backend_spawn_helper (spawn, BACKEND_FILE, "update-system", pk_backend_bool_to_text (only_trusted), NULL);
+ pk_backend_spawn_helper (spawn, BACKEND_FILE, "update-system", pk_backend_bool_to_string (only_trusted), NULL);
}
PK_BACKEND_OPTIONS (
diff --git a/backends/ports/pk-backend-ports.c b/backends/ports/pk-backend-ports.c
index 5ae5bb2..54a86a2 100644
--- a/backends/ports/pk-backend-ports.c
+++ b/backends/ports/pk-backend-ports.c
@@ -134,7 +134,7 @@ backend_download_packages (PkBackend *backend, gchar **package_ids, const gchar
gchar *package_ids_temp;
/* send the complete list as stdin */
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "download-packages", directory, package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -148,9 +148,9 @@ backend_get_depends (PkBackend *backend, PkBitfield filters, gchar **package_ids
gchar *filters_text;
gchar *package_ids_temp;
- package_ids_temp = pk_package_ids_to_text (package_ids);
- filters_text = pk_filter_bitfield_to_text (filters);
- pk_backend_spawn_helper (spawn, BACKEND_FILE, "get-depends", filters_text, package_ids_temp, pk_backend_bool_to_text (recursive), NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ filters_text = pk_filter_bitfield_to_string (filters);
+ pk_backend_spawn_helper (spawn, BACKEND_FILE, "get-depends", filters_text, package_ids_temp, pk_backend_bool_to_string (recursive), NULL);
g_free (package_ids_temp);
g_free (filters_text);
}
@@ -163,7 +163,7 @@ backend_get_details (PkBackend *backend, gchar **package_ids)
{
gchar *package_ids_temp;
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "get-details", package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -176,7 +176,7 @@ backend_get_files (PkBackend *backend, gchar **package_ids)
{
gchar *package_ids_temp;
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "get-files", package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -189,7 +189,7 @@ backend_get_update_detail (PkBackend *backend, gchar **package_ids)
{
gchar *package_ids_temp;
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "get-update-detail", package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -202,7 +202,7 @@ backend_get_updates (PkBackend *backend, PkBitfield filters)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "get-updates", filters_text, NULL);
g_free (filters_text);
}
@@ -216,8 +216,8 @@ backend_install_packages (PkBackend *backend, gboolean only_trusted, gchar **pac
gchar *package_ids_temp;
/* send the complete list as stdin */
- package_ids_temp = pk_package_ids_to_text (package_ids);
- pk_backend_spawn_helper (spawn, BACKEND_FILE, "install-packages", pk_backend_bool_to_text (only_trusted), package_ids_temp, NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ pk_backend_spawn_helper (spawn, BACKEND_FILE, "install-packages", pk_backend_bool_to_string (only_trusted), package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -231,7 +231,7 @@ backend_install_files (PkBackend *backend, gboolean only_trusted, gchar **full_p
/* send the complete list as stdin */
full_paths_temp = g_strjoinv (PK_BACKEND_SPAWN_FILENAME_DELIM, full_paths);
- pk_backend_spawn_helper (spawn, BACKEND_FILE, "install-files", pk_backend_bool_to_text (only_trusted), full_paths_temp, NULL);
+ pk_backend_spawn_helper (spawn, BACKEND_FILE, "install-files", pk_backend_bool_to_string (only_trusted), full_paths_temp, NULL);
g_free (full_paths_temp);
}
@@ -248,7 +248,7 @@ backend_refresh_cache (PkBackend *backend, gboolean force)
return;
}
- pk_backend_spawn_helper (spawn, BACKEND_FILE, "refresh-cache", pk_backend_bool_to_text (force), NULL);
+ pk_backend_spawn_helper (spawn, BACKEND_FILE, "refresh-cache", pk_backend_bool_to_string (force), NULL);
}
/**
@@ -259,8 +259,8 @@ backend_remove_packages (PkBackend *backend, gchar **package_ids, gboolean allow
{
gchar *package_ids_temp;
- package_ids_temp = pk_package_ids_to_text (package_ids);
- pk_backend_spawn_helper (spawn, BACKEND_FILE, "remove-packages", pk_backend_bool_to_text (allow_deps), pk_backend_bool_to_text (autoremove), package_ids_temp, NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ pk_backend_spawn_helper (spawn, BACKEND_FILE, "remove-packages", pk_backend_bool_to_string (allow_deps), pk_backend_bool_to_string (autoremove), package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -273,8 +273,8 @@ backend_resolve (PkBackend *backend, PkBitfield filters, gchar **package_ids)
gchar *filters_text;
gchar *package_ids_temp;
- filters_text = pk_filter_bitfield_to_text (filters);
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ filters_text = pk_filter_bitfield_to_string (filters);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "resolve", filters_text, package_ids_temp, NULL);
g_free (package_ids_temp);
g_free (filters_text);
@@ -288,7 +288,7 @@ backend_search_details (PkBackend *backend, PkBitfield filters, const gchar *sea
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "search-details", filters_text, search, NULL);
g_free (filters_text);
}
@@ -301,7 +301,7 @@ backend_search_file (PkBackend *backend, PkBitfield filters, const gchar *search
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "search-file", filters_text, search, NULL);
g_free (filters_text);
}
@@ -314,7 +314,7 @@ backend_search_group (PkBackend *backend, PkBitfield filters, const gchar *searc
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "search-group", filters_text, search, NULL);
g_free (filters_text);
}
@@ -327,7 +327,7 @@ backend_search_name (PkBackend *backend, PkBitfield filters, const gchar *search
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "search-name", filters_text, search, NULL);
g_free (filters_text);
}
@@ -341,7 +341,7 @@ backend_update_packages (PkBackend *backend, gboolean only_trusted, gchar **pack
gchar *package_ids_temp;
/* send the complete list as stdin */
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "update-packages", package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -354,7 +354,7 @@ backend_get_packages (PkBackend *backend, PkBitfield filters)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "get-packages", filters_text, NULL);
g_free (filters_text);
}
@@ -367,7 +367,7 @@ backend_get_repo_list (PkBackend *backend, PkBitfield filters)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "get-repo-list", filters_text, NULL);
g_free (filters_text);
}
@@ -381,9 +381,9 @@ backend_get_requires (PkBackend *backend, PkBitfield filters, gchar **package_id
gchar *package_ids_temp;
gchar *filters_text;
- package_ids_temp = pk_package_ids_to_text (package_ids);
- filters_text = pk_filter_bitfield_to_text (filters);
- pk_backend_spawn_helper (spawn, BACKEND_FILE, "get-requires", filters_text, package_ids_temp, pk_backend_bool_to_text (recursive), NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ filters_text = pk_filter_bitfield_to_string (filters);
+ pk_backend_spawn_helper (spawn, BACKEND_FILE, "get-requires", filters_text, package_ids_temp, pk_backend_bool_to_string (recursive), NULL);
g_free (filters_text);
g_free (package_ids_temp);
}
@@ -394,7 +394,7 @@ backend_get_requires (PkBackend *backend, PkBitfield filters, gchar **package_id
static void
backend_update_system (PkBackend *backend, gboolean only_trusted)
{
- pk_backend_spawn_helper (spawn, BACKEND_FILE, "update-system", pk_backend_bool_to_text (only_trusted), NULL);
+ pk_backend_spawn_helper (spawn, BACKEND_FILE, "update-system", pk_backend_bool_to_string (only_trusted), NULL);
}
PK_BACKEND_OPTIONS (
diff --git a/backends/slapt/pk-backend-slapt.c b/backends/slapt/pk-backend-slapt.c
index 66cff77..ae2ca17 100644
--- a/backends/slapt/pk-backend-slapt.c
+++ b/backends/slapt/pk-backend-slapt.c
@@ -963,7 +963,7 @@ backend_search_group (PkBackend *backend, PkBitfield filters, const gchar *searc
state = PK_INFO_ENUM_AVAILABLE;
}
- search_group = pk_group_enum_from_text(search);
+ search_group = pk_group_enum_from_string(search);
for (i = 0; i < pkglist->pkg_count; i++) {
pkg = pkglist->pkgs[i];
diff --git a/backends/smart/pk-backend-smart.c b/backends/smart/pk-backend-smart.c
index e378a3a..108abb1 100644
--- a/backends/smart/pk-backend-smart.c
+++ b/backends/smart/pk-backend-smart.c
@@ -142,7 +142,7 @@ backend_download_packages (PkBackend *backend, gchar **package_ids, const gchar
gchar *package_ids_temp;
/* send the complete list as stdin */
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "download-packages", directory, package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -155,9 +155,9 @@ backend_get_depends (PkBackend *backend, PkBitfield filters, gchar **package_ids
{
gchar *filters_text;
gchar *package_ids_temp;
- package_ids_temp = pk_package_ids_to_text (package_ids);
- filters_text = pk_filter_bitfield_to_text (filters);
- pk_backend_spawn_helper (spawn, BACKEND_FILE, "get-depends", filters_text, package_ids_temp, pk_backend_bool_to_text (recursive), NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ filters_text = pk_filter_bitfield_to_string (filters);
+ pk_backend_spawn_helper (spawn, BACKEND_FILE, "get-depends", filters_text, package_ids_temp, pk_backend_bool_to_string (recursive), NULL);
g_free (filters_text);
g_free (package_ids_temp);
}
@@ -169,7 +169,7 @@ static void
backend_get_details (PkBackend *backend, gchar **package_ids)
{
gchar *package_ids_temp;
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "get-details", package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -181,7 +181,7 @@ static void
backend_get_files (PkBackend *backend, gchar **package_ids)
{
gchar *package_ids_temp;
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "get-files", package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -194,9 +194,9 @@ backend_get_requires (PkBackend *backend, PkBitfield filters, gchar **package_id
{
gchar *package_ids_temp;
gchar *filters_text;
- package_ids_temp = pk_package_ids_to_text (package_ids);
- filters_text = pk_filter_bitfield_to_text (filters);
- pk_backend_spawn_helper (spawn, BACKEND_FILE, "get-requires", filters_text, package_ids_temp, pk_backend_bool_to_text (recursive), NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ filters_text = pk_filter_bitfield_to_string (filters);
+ pk_backend_spawn_helper (spawn, BACKEND_FILE, "get-requires", filters_text, package_ids_temp, pk_backend_bool_to_string (recursive), NULL);
g_free (filters_text);
g_free (package_ids_temp);
}
@@ -208,7 +208,7 @@ static void
backend_get_updates (PkBackend *backend, PkBitfield filters)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "get-updates", filters_text, NULL);
g_free (filters_text);
}
@@ -220,7 +220,7 @@ static void
backend_get_packages (PkBackend *backend, PkBitfield filters)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "get-packages", filters_text, NULL);
g_free (filters_text);
}
@@ -232,7 +232,7 @@ static void
backend_get_update_detail (PkBackend *backend, gchar **package_ids)
{
gchar *package_ids_temp;
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "get-update-detail", package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -253,8 +253,8 @@ backend_install_packages (PkBackend *backend, gboolean only_trusted, gchar **pac
}
/* send the complete list as stdin */
- package_ids_temp = pk_package_ids_to_text (package_ids);
- pk_backend_spawn_helper (spawn, BACKEND_FILE, "install-packages", pk_backend_bool_to_text (only_trusted), package_ids_temp, NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ pk_backend_spawn_helper (spawn, BACKEND_FILE, "install-packages", pk_backend_bool_to_string (only_trusted), package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -268,7 +268,7 @@ backend_install_files (PkBackend *backend, gboolean only_trusted, gchar **full_p
/* send the complete list as stdin */
full_paths_temp = g_strjoinv (PK_BACKEND_SPAWN_FILENAME_DELIM, full_paths);
- pk_backend_spawn_helper (spawn, BACKEND_FILE, "install-files", pk_backend_bool_to_text (only_trusted), full_paths_temp, NULL);
+ pk_backend_spawn_helper (spawn, BACKEND_FILE, "install-files", pk_backend_bool_to_string (only_trusted), full_paths_temp, NULL);
g_free (full_paths_temp);
}
@@ -285,7 +285,7 @@ backend_refresh_cache (PkBackend *backend, gboolean force)
return;
}
- pk_backend_spawn_helper (spawn, BACKEND_FILE, "refresh-cache", pk_backend_bool_to_text (force), NULL);
+ pk_backend_spawn_helper (spawn, BACKEND_FILE, "refresh-cache", pk_backend_bool_to_string (force), NULL);
}
/**
@@ -297,8 +297,8 @@ backend_remove_packages (PkBackend *backend, gchar **package_ids, gboolean allow
gchar *package_ids_temp;
/* send the complete list as stdin */
- package_ids_temp = pk_package_ids_to_text (package_ids);
- pk_backend_spawn_helper (spawn, BACKEND_FILE, "remove-packages", pk_backend_bool_to_text (allow_deps), pk_backend_bool_to_text (autoremove), package_ids_temp, NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ pk_backend_spawn_helper (spawn, BACKEND_FILE, "remove-packages", pk_backend_bool_to_string (allow_deps), pk_backend_bool_to_string (autoremove), package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -310,7 +310,7 @@ backend_search_details (PkBackend *backend, PkBitfield filters, gchar **values)
{
gchar *filters_text;
gchar *search;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
search = g_strjoinv ("&", values);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "search-details", filters_text, search, NULL);
g_free (filters_text);
@@ -325,7 +325,7 @@ backend_search_files (PkBackend *backend, PkBitfield filters, gchar **values)
{
gchar *filters_text;
gchar *search;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
search = g_strjoinv ("&", values);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "search-file", filters_text, search, NULL);
g_free (filters_text);
@@ -340,7 +340,7 @@ backend_search_groups (PkBackend *backend, PkBitfield filters, gchar **values)
{
gchar *filters_text;
gchar *search;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
search = g_strjoinv ("&", values);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "search-group", filters_text, search, NULL);
g_free (filters_text);
@@ -355,7 +355,7 @@ backend_search_names (PkBackend *backend, PkBitfield filters, gchar **values)
{
gchar *filters_text;
gchar *search;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
search = g_strjoinv ("&", values);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "search-name", filters_text, search, NULL);
g_free (filters_text);
@@ -378,8 +378,8 @@ backend_update_packages (PkBackend *backend, gboolean only_trusted, gchar **pack
}
/* send the complete list as stdin */
- package_ids_temp = pk_package_ids_to_text (package_ids);
- pk_backend_spawn_helper (spawn, BACKEND_FILE, "update-packages", pk_backend_bool_to_text (only_trusted), package_ids_temp, NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ pk_backend_spawn_helper (spawn, BACKEND_FILE, "update-packages", pk_backend_bool_to_string (only_trusted), package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -389,7 +389,7 @@ backend_update_packages (PkBackend *backend, gboolean only_trusted, gchar **pack
static void
backend_update_system (PkBackend *backend, gboolean only_trusted)
{
- pk_backend_spawn_helper (spawn, BACKEND_FILE, "update-system", pk_backend_bool_to_text (only_trusted), NULL);
+ pk_backend_spawn_helper (spawn, BACKEND_FILE, "update-system", pk_backend_bool_to_string (only_trusted), NULL);
}
/**
@@ -400,8 +400,8 @@ backend_resolve (PkBackend *backend, PkBitfield filters, gchar **package_ids)
{
gchar *filters_text;
gchar *package_ids_temp;
- filters_text = pk_filter_bitfield_to_text (filters);
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ filters_text = pk_filter_bitfield_to_string (filters);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "resolve", filters_text, package_ids_temp, NULL);
g_free (filters_text);
g_free (package_ids_temp);
@@ -414,7 +414,7 @@ static void
backend_get_repo_list (PkBackend *backend, PkBitfield filters)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, BACKEND_FILE, "get-repo-list", filters_text, NULL);
g_free (filters_text);
}
diff --git a/backends/test/pk-backend-test-spawn.c b/backends/test/pk-backend-test-spawn.c
index 1e39f05..c416862 100644
--- a/backends/test/pk-backend-test-spawn.c
+++ b/backends/test/pk-backend-test-spawn.c
@@ -37,7 +37,7 @@ backend_search_names (PkBackend *backend, PkBitfield filters, gchar **values)
gchar *search;
pk_backend_set_allow_cancel (backend, TRUE);
pk_backend_set_percentage (backend, PK_BACKEND_PERCENTAGE_INVALID);
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
search = g_strjoinv ("&", values);
pk_backend_spawn_helper (spawn, "search-name.sh", filters_text, search, NULL);
g_free (filters_text);
diff --git a/backends/test/pk-backend-test-thread.c b/backends/test/pk-backend-test-thread.c
index 2948a83..f967e70 100644
--- a/backends/test/pk-backend-test-thread.c
+++ b/backends/test/pk-backend-test-thread.c
@@ -87,7 +87,7 @@ backend_search_name_thread (PkBackend *backend)
filters = pk_backend_get_uint (backend, "filters");
search = pk_backend_get_string (backend, "search");
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
egg_debug ("started task (%p) search=%s filters=%s", backend, search, filters_text);
g_free (filters_text);
pk_backend_set_status (backend, PK_STATUS_ENUM_QUERY);
diff --git a/backends/urpmi/pk-backend-urpmi.c b/backends/urpmi/pk-backend-urpmi.c
index a88cf02..73eefed 100644
--- a/backends/urpmi/pk-backend-urpmi.c
+++ b/backends/urpmi/pk-backend-urpmi.c
@@ -105,7 +105,7 @@ static void
backend_search_names (PkBackend *backend, PkBitfield filters, gchar **search)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, "urpmi-dispatched-backend.pl", "search-name", filters_text, search[0], NULL);
g_free (filters_text);
}
@@ -117,7 +117,7 @@ static void
backend_get_details (PkBackend *backend, gchar **package_ids)
{
gchar *package_ids_temp;
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, "urpmi-dispatched-backend.pl", "get-details", package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -129,7 +129,7 @@ static void
backend_get_files (PkBackend *backend, gchar **package_ids)
{
gchar *package_ids_temp;
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, "urpmi-dispatched-backend.pl", "get-files", package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -142,9 +142,9 @@ backend_get_depends (PkBackend *backend, PkBitfield filters, gchar **package_ids
{
gchar *filters_text;
gchar *package_ids_temp;
- package_ids_temp = pk_package_ids_to_text (package_ids);
- filters_text = pk_filter_bitfield_to_text (filters);
- pk_backend_spawn_helper (spawn, "urpmi-dispatched-backend.pl", "get-depends", filters_text, package_ids_temp, pk_backend_bool_to_text (recursive), NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ filters_text = pk_filter_bitfield_to_string (filters);
+ pk_backend_spawn_helper (spawn, "urpmi-dispatched-backend.pl", "get-depends", filters_text, package_ids_temp, pk_backend_bool_to_string (recursive), NULL);
g_free (filters_text);
g_free (package_ids_temp);
}
@@ -156,7 +156,7 @@ static void
backend_get_updates (PkBackend *backend, PkBitfield filters)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, "urpmi-dispatched-backend.pl", "get-updates", filters_text, NULL);
g_free (filters_text);
}
@@ -168,7 +168,7 @@ static void
backend_get_update_detail (PkBackend *backend, gchar **package_ids)
{
gchar *package_ids_temp;
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, "urpmi-dispatched-backend.pl", "get-update-detail", package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -186,7 +186,7 @@ backend_refresh_cache (PkBackend *backend, gboolean force)
return;
}
- pk_backend_spawn_helper (spawn, "urpmi-dispatched-backend.pl", "refresh-cache", pk_backend_bool_to_text (force), NULL);
+ pk_backend_spawn_helper (spawn, "urpmi-dispatched-backend.pl", "refresh-cache", pk_backend_bool_to_string (force), NULL);
}
/**
@@ -205,8 +205,8 @@ backend_install_packages (PkBackend *backend, gboolean only_trusted, gchar **pac
}
/* send the complete list as stdin */
- package_ids_temp = pk_package_ids_to_text (package_ids);
- pk_backend_spawn_helper (spawn, "urpmi-dispatched-backend.pl", "install-packages", pk_backend_bool_to_text (only_trusted), package_ids_temp, NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ pk_backend_spawn_helper (spawn, "urpmi-dispatched-backend.pl", "install-packages", pk_backend_bool_to_string (only_trusted), package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -219,8 +219,8 @@ backend_remove_packages (PkBackend *backend, gchar **package_ids, gboolean allow
gchar *package_ids_temp;
/* send the complete list as stdin */
- package_ids_temp = pk_package_ids_to_text (package_ids);
- pk_backend_spawn_helper (spawn, "urpmi-dispatched-backend.pl", "remove-packages", pk_backend_bool_to_text (allow_deps), package_ids_temp, NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ pk_backend_spawn_helper (spawn, "urpmi-dispatched-backend.pl", "remove-packages", pk_backend_bool_to_string (allow_deps), package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -230,7 +230,7 @@ backend_remove_packages (PkBackend *backend, gchar **package_ids, gboolean allow
static void
backend_repo_enable (PkBackend *backend, const gchar *rid, gboolean enabled)
{
- pk_backend_spawn_helper (spawn, "urpmi-dispatched-backend.pl", "repo-enable", rid, pk_backend_bool_to_text (enabled), NULL);
+ pk_backend_spawn_helper (spawn, "urpmi-dispatched-backend.pl", "repo-enable", rid, pk_backend_bool_to_string (enabled), NULL);
}
/**
@@ -240,7 +240,7 @@ static void
backend_search_groups (PkBackend *backend, PkBitfield filters, gchar **search)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, "urpmi-dispatched-backend.pl", "search-group", filters_text, search[0], NULL);
g_free (filters_text);
}
@@ -252,7 +252,7 @@ static void
backend_get_packages (PkBackend *backend, PkBitfield filters)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, "urpmi-dispatched-backend.pl", "get-packages", filters_text, NULL);
g_free (filters_text);
}
@@ -273,9 +273,9 @@ backend_get_requires (PkBackend *backend, PkBitfield filters, gchar **package_id
{
gchar *package_ids_temp;
gchar *filters_text;
- package_ids_temp = pk_package_ids_to_text (package_ids);
- filters_text = pk_filter_bitfield_to_text (filters);
- pk_backend_spawn_helper (spawn, "urpmi-dispatched-backend.pl", "get-requires", filters_text, package_ids_temp, pk_backend_bool_to_text (recursive), NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ filters_text = pk_filter_bitfield_to_string (filters);
+ pk_backend_spawn_helper (spawn, "urpmi-dispatched-backend.pl", "get-requires", filters_text, package_ids_temp, pk_backend_bool_to_string (recursive), NULL);
g_free (filters_text);
g_free (package_ids_temp);
}
@@ -287,7 +287,7 @@ static void
backend_search_details (PkBackend *backend, PkBitfield filters, gchar **search)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, "urpmi-dispatched-backend.pl", "search-details", filters_text, search[0], NULL);
g_free (filters_text);
}
@@ -299,7 +299,7 @@ static void
backend_search_files (PkBackend *backend, PkBitfield filters, gchar **search)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, "urpmi-dispatched-backend.pl", "search-file", filters_text, search[0], NULL);
g_free (filters_text);
}
@@ -312,8 +312,8 @@ backend_resolve (PkBackend *backend, PkBitfield filters, gchar **package_ids)
{
gchar *filters_text;
gchar *package_ids_temp;
- filters_text = pk_filter_bitfield_to_text (filters);
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ filters_text = pk_filter_bitfield_to_string (filters);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, "urpmi-dispatched-backend.pl", "resolve", filters_text, package_ids_temp, NULL);
g_free (filters_text);
g_free (package_ids_temp);
@@ -336,8 +336,8 @@ backend_update_packages (PkBackend *backend, gboolean only_trusted, gchar **pack
}
/* send the complete list as stdin */
- package_ids_temp = pk_package_ids_to_text (package_ids);
- pk_backend_spawn_helper (spawn, "urpmi-dispatched-backend.pl", "update-packages", pk_backend_bool_to_text (only_trusted), package_ids_temp, NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ pk_backend_spawn_helper (spawn, "urpmi-dispatched-backend.pl", "update-packages", pk_backend_bool_to_string (only_trusted), package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -347,7 +347,7 @@ backend_update_packages (PkBackend *backend, gboolean only_trusted, gchar **pack
static void
backend_update_system (PkBackend *backend, gboolean only_trusted)
{
- pk_backend_spawn_helper (spawn, "urpmi-dispatched-backend.pl", "update-system", pk_backend_bool_to_text (only_trusted), NULL);
+ pk_backend_spawn_helper (spawn, "urpmi-dispatched-backend.pl", "update-system", pk_backend_bool_to_string (only_trusted), NULL);
}
/**
diff --git a/backends/yum/pk-backend-yum.c b/backends/yum/pk-backend-yum.c
index b83c0e7..06a1729 100644
--- a/backends/yum/pk-backend-yum.c
+++ b/backends/yum/pk-backend-yum.c
@@ -228,7 +228,7 @@ backend_download_packages (PkBackend *backend, gchar **package_ids, const gchar
gchar *package_ids_temp;
/* send the complete list as stdin */
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, "yumBackend.py", "download-packages", directory, package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -241,9 +241,9 @@ backend_get_depends (PkBackend *backend, PkBitfield filters, gchar **package_ids
{
gchar *filters_text;
gchar *package_ids_temp;
- package_ids_temp = pk_package_ids_to_text (package_ids);
- filters_text = pk_filter_bitfield_to_text (filters);
- pk_backend_spawn_helper (spawn, "yumBackend.py", "get-depends", filters_text, package_ids_temp, pk_backend_bool_to_text (recursive), NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ filters_text = pk_filter_bitfield_to_string (filters);
+ pk_backend_spawn_helper (spawn, "yumBackend.py", "get-depends", filters_text, package_ids_temp, pk_backend_bool_to_string (recursive), NULL);
g_free (filters_text);
g_free (package_ids_temp);
}
@@ -255,7 +255,7 @@ static void
backend_get_details (PkBackend *backend, gchar **package_ids)
{
gchar *package_ids_temp;
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, "yumBackend.py", "get-details", package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -276,7 +276,7 @@ static void
backend_get_files (PkBackend *backend, gchar **package_ids)
{
gchar *package_ids_temp;
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, "yumBackend.py", "get-files", package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -289,9 +289,9 @@ backend_get_requires (PkBackend *backend, PkBitfield filters, gchar **package_id
{
gchar *package_ids_temp;
gchar *filters_text;
- package_ids_temp = pk_package_ids_to_text (package_ids);
- filters_text = pk_filter_bitfield_to_text (filters);
- pk_backend_spawn_helper (spawn, "yumBackend.py", "get-requires", filters_text, package_ids_temp, pk_backend_bool_to_text (recursive), NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ filters_text = pk_filter_bitfield_to_string (filters);
+ pk_backend_spawn_helper (spawn, "yumBackend.py", "get-requires", filters_text, package_ids_temp, pk_backend_bool_to_string (recursive), NULL);
g_free (filters_text);
g_free (package_ids_temp);
}
@@ -303,7 +303,7 @@ static void
backend_get_updates (PkBackend *backend, PkBitfield filters)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, "yumBackend.py", "get-updates", filters_text, NULL);
g_free (filters_text);
}
@@ -315,7 +315,7 @@ static void
backend_get_packages (PkBackend *backend, PkBitfield filters)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, "yumBackend.py", "get-packages", filters_text, NULL);
g_free (filters_text);
}
@@ -327,7 +327,7 @@ static void
backend_get_update_detail (PkBackend *backend, gchar **package_ids)
{
gchar *package_ids_temp;
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, "yumBackend.py", "get-update-detail", package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -341,8 +341,8 @@ backend_install_packages (PkBackend *backend, gboolean only_trusted, gchar **pac
gchar *package_ids_temp;
/* send the complete list as stdin */
- package_ids_temp = pk_package_ids_to_text (package_ids);
- pk_backend_spawn_helper (spawn, "yumBackend.py", "install-packages", pk_backend_bool_to_text (only_trusted), package_ids_temp, NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ pk_backend_spawn_helper (spawn, "yumBackend.py", "install-packages", pk_backend_bool_to_string (only_trusted), package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -356,7 +356,7 @@ backend_install_files (PkBackend *backend, gboolean only_trusted, gchar **full_p
/* send the complete list as stdin */
package_ids_temp = g_strjoinv (PK_BACKEND_SPAWN_FILENAME_DELIM, full_paths);
- pk_backend_spawn_helper (spawn, "yumBackend.py", "install-files", pk_backend_bool_to_text (only_trusted), package_ids_temp, NULL);
+ pk_backend_spawn_helper (spawn, "yumBackend.py", "install-files", pk_backend_bool_to_string (only_trusted), package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -369,7 +369,7 @@ backend_install_signature (PkBackend *backend, PkSigTypeEnum type,
{
const gchar *type_text;
- type_text = pk_sig_type_enum_to_text (type);
+ type_text = pk_sig_type_enum_to_string (type);
pk_backend_spawn_helper (spawn, "yumBackend.py", "install-signature", type_text, key_id, package_id, NULL);
}
@@ -386,7 +386,7 @@ backend_refresh_cache (PkBackend *backend, gboolean force)
return;
}
- pk_backend_spawn_helper (spawn, "yumBackend.py", "refresh-cache", pk_backend_bool_to_text (force), NULL);
+ pk_backend_spawn_helper (spawn, "yumBackend.py", "refresh-cache", pk_backend_bool_to_string (force), NULL);
}
/**
@@ -398,8 +398,8 @@ backend_remove_packages (PkBackend *backend, gchar **package_ids, gboolean allow
gchar *package_ids_temp;
/* send the complete list as stdin */
- package_ids_temp = pk_package_ids_to_text (package_ids);
- pk_backend_spawn_helper (spawn, "yumBackend.py", "remove-packages", pk_backend_bool_to_text (allow_deps), pk_backend_bool_to_text (autoremove), package_ids_temp, NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ pk_backend_spawn_helper (spawn, "yumBackend.py", "remove-packages", pk_backend_bool_to_string (allow_deps), pk_backend_bool_to_string (autoremove), package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -411,7 +411,7 @@ backend_search_details (PkBackend *backend, PkBitfield filters, gchar **values)
{
gchar *filters_text;
gchar *search;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
search = g_strjoinv ("&", values);
pk_backend_spawn_helper (spawn, "yumBackend.py", "search-details", filters_text, search, NULL);
g_free (filters_text);
@@ -426,7 +426,7 @@ backend_search_files (PkBackend *backend, PkBitfield filters, gchar **values)
{
gchar *filters_text;
gchar *search;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
search = g_strjoinv ("&", values);
pk_backend_spawn_helper (spawn, "yumBackend.py", "search-file", filters_text, search, NULL);
g_free (filters_text);
@@ -441,7 +441,7 @@ backend_search_groups (PkBackend *backend, PkBitfield filters, gchar **values)
{
gchar *filters_text;
gchar *search;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
search = g_strjoinv ("&", values);
pk_backend_spawn_helper (spawn, "yumBackend.py", "search-group", filters_text, search, NULL);
g_free (filters_text);
@@ -456,7 +456,7 @@ backend_search_names (PkBackend *backend, PkBitfield filters, gchar **values)
{
gchar *filters_text;
gchar *search;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
search = g_strjoinv ("&", values);
pk_backend_spawn_helper (spawn, "yumBackend.py", "search-name", filters_text, search, NULL);
g_free (filters_text);
@@ -472,8 +472,8 @@ backend_update_packages (PkBackend *backend, gboolean only_trusted, gchar **pack
gchar *package_ids_temp;
/* send the complete list as stdin */
- package_ids_temp = pk_package_ids_to_text (package_ids);
- pk_backend_spawn_helper (spawn, "yumBackend.py", "update-packages", pk_backend_bool_to_text (only_trusted), package_ids_temp, NULL);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
+ pk_backend_spawn_helper (spawn, "yumBackend.py", "update-packages", pk_backend_bool_to_string (only_trusted), package_ids_temp, NULL);
g_free (package_ids_temp);
}
@@ -483,7 +483,7 @@ backend_update_packages (PkBackend *backend, gboolean only_trusted, gchar **pack
static void
backend_update_system (PkBackend *backend, gboolean only_trusted)
{
- pk_backend_spawn_helper (spawn, "yumBackend.py", "update-system", pk_backend_bool_to_text (only_trusted), NULL);
+ pk_backend_spawn_helper (spawn, "yumBackend.py", "update-system", pk_backend_bool_to_string (only_trusted), NULL);
}
/**
@@ -494,8 +494,8 @@ backend_resolve (PkBackend *backend, PkBitfield filters, gchar **package_ids)
{
gchar *filters_text;
gchar *package_ids_temp;
- filters_text = pk_filter_bitfield_to_text (filters);
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ filters_text = pk_filter_bitfield_to_string (filters);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
pk_backend_spawn_helper (spawn, "yumBackend.py", "resolve", filters_text, package_ids_temp, NULL);
g_free (filters_text);
g_free (package_ids_temp);
@@ -508,7 +508,7 @@ static void
backend_get_repo_list (PkBackend *backend, PkBitfield filters)
{
gchar *filters_text;
- filters_text = pk_filter_bitfield_to_text (filters);
+ filters_text = pk_filter_bitfield_to_string (filters);
pk_backend_spawn_helper (spawn, "yumBackend.py", "get-repo-list", filters_text, NULL);
g_free (filters_text);
}
@@ -544,8 +544,8 @@ backend_what_provides (PkBackend *backend, PkBitfield filters, PkProvidesEnum pr
gchar *filters_text;
gchar *search;
const gchar *provides_text;
- provides_text = pk_provides_enum_to_text (provides);
- filters_text = pk_filter_bitfield_to_text (filters);
+ provides_text = pk_provides_enum_to_string (provides);
+ filters_text = pk_filter_bitfield_to_string (filters);
search = g_strjoinv ("&", values);
pk_backend_spawn_helper (spawn, "yumBackend.py", "what-provides", filters_text, provides_text, search, NULL);
g_free (filters_text);
diff --git a/backends/zypp/pk-backend-zypp.cpp b/backends/zypp/pk-backend-zypp.cpp
index d6fcbd1..7332732 100644
--- a/backends/zypp/pk-backend-zypp.cpp
+++ b/backends/zypp/pk-backend-zypp.cpp
@@ -1233,7 +1233,7 @@ backend_resolve_thread (PkBackend *backend)
{
gchar **package_ids = pk_backend_get_strv (backend, "package_ids");
PkBitfield filters_field = (PkBitfield) pk_backend_get_uint (backend, "filters");
- gchar *filters = pk_filter_bitfield_to_text(filters_field);
+ gchar *filters = pk_filter_bitfield_to_string(filters_field);
pk_backend_set_status (backend, PK_STATUS_ENUM_QUERY);
@@ -1382,7 +1382,7 @@ backend_search_group_thread (PkBackend *backend)
pk_backend_set_percentage (backend, 30);
std::vector<zypp::sat::Solvable> *v = new std::vector<zypp::sat::Solvable> ();
- PkGroupEnum pkGroup = pk_group_enum_from_text (group);
+ PkGroupEnum pkGroup = pk_group_enum_from_string (group);
zypp::sat::LookupAttr look (zypp::sat::SolvAttr::group);
@@ -1768,7 +1768,7 @@ backend_what_provides_thread (PkBackend *backend)
search = pk_backend_get_string (backend, "search");
PkProvidesEnum provides = (PkProvidesEnum) pk_backend_get_uint (backend, "provides");
PkBitfield filters_field = (PkBitfield) pk_backend_get_uint (backend, "filters");
- gchar *filters = pk_filter_bitfield_to_text(filters_field);
+ gchar *filters = pk_filter_bitfield_to_string(filters_field);
zypp::Capability cap (search);
zypp::sat::WhatProvides prov (cap);
diff --git a/client/pk-console.c b/client/pk-console.c
index de927e1..9ba71af 100644
--- a/client/pk-console.c
+++ b/client/pk-console.c
@@ -170,7 +170,7 @@ pk_console_transaction_cb (PkTransactionPast *item, gpointer user_data)
"data", &data,
NULL);
- role_text = pk_role_enum_to_text (role);
+ role_text = pk_role_enum_to_string (role);
/* TRANSLATORS: this is an atomic transaction */
g_print ("%s: %s\n", _("Transaction"), tid);
/* TRANSLATORS: this is the time the transaction was started in system timezone */
@@ -247,7 +247,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_text (state));
+ g_print (" %s: %s\n", _("Type"), pk_update_state_enum_to_string (state));
/* TRANSLATORS: this is any summary text describing the upgrade */
g_print (" %s: %s\n", _("Summary"), summary);
@@ -366,7 +366,7 @@ pk_console_update_detail_cb (PkUpdateDetail *item, gpointer data)
}
if (restart != PK_RESTART_ENUM_NONE) {
/* TRANSLATORS: details about the update, if the package requires a restart */
- g_print (" %s: %s\n", _("Restart"), pk_restart_enum_to_text (restart));
+ g_print (" %s: %s\n", _("Restart"), pk_restart_enum_to_string (restart));
}
if (update_text != NULL) {
/* TRANSLATORS: details about the update, any description of the update */
@@ -378,7 +378,7 @@ pk_console_update_detail_cb (PkUpdateDetail *item, gpointer data)
}
if (state != PK_UPDATE_STATE_ENUM_UNKNOWN) {
/* TRANSLATORS: details about the update, the ongoing state of the update */
- g_print (" %s: %s\n", _("State"), pk_update_state_enum_to_text (state));
+ g_print (" %s: %s\n", _("State"), pk_update_state_enum_to_string (state));
}
if (issued != NULL) {
/* TRANSLATORS: details about the update, date the update was issued */
@@ -507,7 +507,7 @@ pk_console_details_cb (PkDetails *item, gpointer data)
g_print ("%s\n", _("Package description"));
g_print (" package: %s\n", package);
g_print (" license: %s\n", license);
- g_print (" group: %s\n", pk_group_enum_to_text (group));
+ g_print (" group: %s\n", pk_group_enum_to_string (group));
g_print (" description: %s\n", description);
g_print (" size: %lu bytes\n", (long unsigned int) size);
g_print (" url: %s\n", url);
@@ -535,7 +535,7 @@ pk_console_message_cb (PkMessage *item, gpointer data)
NULL);
/* TRANSLATORS: This a message (like a little note that may be of interest) from the transaction */
- g_print ("%s %s: %s\n", _("Message:"), pk_message_enum_to_text (type), details);
+ g_print ("%s %s: %s\n", _("Message:"), pk_message_enum_to_string (type), details);
g_free (details);
}
@@ -691,7 +691,7 @@ pk_console_finished_cb (GObject *object, GAsyncResult *res, gpointer data)
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
/* TRANSLATORS: the transaction failed in a way we could not expect */
- g_print ("%s: %s, %s\n", _("The transaction failed"), pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_print ("%s: %s, %s\n", _("The transaction failed"), pk_error_enum_to_string (pk_error_get_code (error_code)), pk_error_get_details (error_code));
/* special case */
if (pk_error_get_code (error_code) == PK_ERROR_ENUM_NO_PACKAGES_TO_UPDATE)
@@ -1333,7 +1333,7 @@ main (int argc, char *argv[])
/* check filter */
if (filter != NULL) {
- filters = pk_filter_bitfield_from_text (filter);
+ filters = pk_filter_bitfield_from_string (filter);
if (filters == 0) {
/* TRANSLATORS: The user specified an incorrect filter */
error = g_error_new (1, 0, "%s: %s", _("The filter specified was invalid"), filter);
@@ -1557,7 +1557,7 @@ main (int argc, char *argv[])
retval = PK_EXIT_CODE_SYNTAX_INVALID;
goto out;
}
- role = pk_role_enum_from_text (value);
+ role = pk_role_enum_from_string (value);
if (role == PK_ROLE_ENUM_UNKNOWN) {
/* TRANSLATORS: The user specified an invalid action */
error = g_error_new (1, 0, "%s", _("A correct role is required"));
@@ -1645,7 +1645,7 @@ main (int argc, char *argv[])
(GAsyncReadyCallback) pk_console_finished_cb, NULL);
} else if (strcmp (mode, "get-roles") == 0) {
- text = pk_role_bitfield_to_text (roles);
+ text = pk_role_bitfield_to_string (roles);
g_strdelimit (text, ";", '\n');
g_print ("%s\n", text);
g_free (text);
@@ -1655,7 +1655,7 @@ main (int argc, char *argv[])
g_object_get (control,
"filters", &filters,
NULL);
- text = pk_filter_bitfield_to_text (filters);
+ text = pk_filter_bitfield_to_string (filters);
g_strdelimit (text, ";", '\n');
g_print ("%s\n", text);
g_free (text);
@@ -1665,7 +1665,7 @@ main (int argc, char *argv[])
g_object_get (control,
"groups", &groups,
NULL);
- text = pk_group_bitfield_to_text (groups);
+ text = pk_group_bitfield_to_string (groups);
g_strdelimit (text, ";", '\n');
g_print ("%s\n", text);
g_free (text);
diff --git a/client/pk-generate-pack.c b/client/pk-generate-pack.c
index 0b2b40f..f9d2059 100644
--- a/client/pk-generate-pack.c
+++ b/client/pk-generate-pack.c
@@ -102,7 +102,7 @@ pk_generate_pack_progress_cb (PkProgress *progress, PkProgressType type, gpointe
if (status == PK_STATUS_ENUM_FINISHED)
return;
/* TODO: translate */
- pk_progress_bar_start (progressbar, pk_status_enum_to_text (status));
+ pk_progress_bar_start (progressbar, pk_status_enum_to_string (status));
}
}
diff --git a/client/pk-monitor.c b/client/pk-monitor.c
index f230f7a..ded71fd 100644
--- a/client/pk-monitor.c
+++ b/client/pk-monitor.c
@@ -80,7 +80,7 @@ pk_monitor_notify_network_status_cb (PkControl *control, GParamSpec *pspec, gpoi
{
PkNetworkEnum state;
g_object_get (control, "network-status", &state, NULL);
- g_print ("network status=%s\n", pk_network_enum_to_text (state));
+ g_print ("network status=%s\n", pk_network_enum_to_string (state));
}
/**
@@ -115,12 +115,12 @@ pk_monitor_adopt_cb (PkClient *_client, GAsyncResult *res, gpointer user_data)
NULL);
exit_enum = pk_results_get_exit_code (results);
- g_print ("%s\texit code: %s\n", transaction_id, pk_exit_enum_to_text (exit_enum));
+ g_print ("%s\texit code: %s\n", transaction_id, pk_exit_enum_to_string (exit_enum));
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL)
- g_print ("%s\terror code: %s, %s\n", transaction_id, pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_print ("%s\terror code: %s, %s\n", transaction_id, pk_error_enum_to_string (pk_error_get_code (error_code)), pk_error_get_details (error_code));
out:
g_free (transaction_id);
if (error_code != NULL)
@@ -159,7 +159,7 @@ pk_monitor_progress_cb (PkProgress *progress, PkProgressType type, gpointer user
goto out;
if (type == PK_PROGRESS_TYPE_ROLE) {
- g_print ("%s\trole %s\n", transaction_id, pk_role_enum_to_text (role));
+ g_print ("%s\trole %s\n", transaction_id, pk_role_enum_to_string (role));
} else if (type == PK_PROGRESS_TYPE_PACKAGE_ID) {
g_print ("%s\tpackage %s\n", transaction_id, package_id);
} else if (type == PK_PROGRESS_TYPE_PERCENTAGE) {
@@ -167,7 +167,7 @@ pk_monitor_progress_cb (PkProgress *progress, PkProgressType type, gpointer user
} else if (type == PK_PROGRESS_TYPE_ALLOW_CANCEL) {
g_print ("%s\tallow_cancel %i\n", transaction_id, allow_cancel);
} else if (type == PK_PROGRESS_TYPE_STATUS) {
- g_print ("%s\tstatus %s\n", transaction_id, pk_status_enum_to_text (status));
+ g_print ("%s\tstatus %s\n", transaction_id, pk_status_enum_to_string (status));
}
out:
g_free (package_id);
diff --git a/contrib/browser-plugin/pk-plugin-install.c b/contrib/browser-plugin/pk-plugin-install.c
index c7f2423..f5ba03e 100644
--- a/contrib/browser-plugin/pk-plugin-install.c
+++ b/contrib/browser-plugin/pk-plugin-install.c
@@ -259,7 +259,7 @@ pk_plugin_install_finished_cb (GObject *object, GAsyncResult *res, PkPluginInsta
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- g_warning ("failed to install: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_warning ("failed to install: %s, %s", pk_error_enum_to_string (pk_error_get_code (error_code)), pk_error_get_details (error_code));
goto out;
}
diff --git a/contrib/command-not-found/pk-command-not-found.c b/contrib/command-not-found/pk-command-not-found.c
index 70679c0..75da0c9 100644
--- a/contrib/command-not-found/pk-command-not-found.c
+++ b/contrib/command-not-found/pk-command-not-found.c
@@ -429,7 +429,7 @@ pk_cnf_find_available (const gchar *cmd)
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
/* TRANSLATORS: the transaction failed in a way we could not expect */
- g_printerr ("%s: %s, %s\n", _("The transaction failed"), pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_printerr ("%s: %s, %s\n", _("The transaction failed"), pk_error_enum_to_string (pk_error_get_code (error_code)), pk_error_get_details (error_code));
goto out;
}
@@ -600,7 +600,7 @@ pk_cnf_install_package_id (const gchar *package_id)
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
/* TRANSLATORS: the transaction failed in a way we could not expect */
- g_printerr ("%s: %s, %s\n", _("The transaction failed"), pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ g_printerr ("%s: %s, %s\n", _("The transaction failed"), pk_error_enum_to_string (pk_error_get_code (error_code)), pk_error_get_details (error_code));
goto out;
}
diff --git a/contrib/debuginfo-install/pk-debuginfo-install.c b/contrib/debuginfo-install/pk-debuginfo-install.c
index c12aca5..affb8e9 100644
--- a/contrib/debuginfo-install/pk-debuginfo-install.c
+++ b/contrib/debuginfo-install/pk-debuginfo-install.c
@@ -141,7 +141,7 @@ pk_debuginfo_install_enable_repos (PkDebuginfoInstallPrivate *priv, GPtrArray *a
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- *error = g_error_new (1, 0, "failed to enable repo: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ *error = g_error_new (1, 0, "failed to enable repo: %s, %s", pk_error_enum_to_string (pk_error_get_code (error_code)), pk_error_get_details (error_code));
ret = FALSE;
goto out;
}
@@ -209,7 +209,7 @@ pk_debuginfo_install_packages_install (PkDebuginfoInstallPrivate *priv, GPtrArra
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- *error = g_error_new (1, 0, "failed to resolve: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ *error = g_error_new (1, 0, "failed to resolve: %s, %s", pk_error_enum_to_string (pk_error_get_code (error_code)), pk_error_get_details (error_code));
ret = FALSE;
goto out;
}
@@ -253,7 +253,7 @@ pk_debuginfo_install_resolve_name_to_id (PkDebuginfoInstallPrivate *priv, const
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- *error = g_error_new (1, 0, "failed to resolve: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ *error = g_error_new (1, 0, "failed to resolve: %s, %s", pk_error_enum_to_string (pk_error_get_code (error_code)), pk_error_get_details (error_code));
goto out;
}
@@ -387,7 +387,7 @@ pk_debuginfo_install_add_deps (PkDebuginfoInstallPrivate *priv, GPtrArray *packa
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- *error = g_error_new (1, 0, "failed to get depends: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ *error = g_error_new (1, 0, "failed to get depends: %s, %s", pk_error_enum_to_string (pk_error_get_code (error_code)), pk_error_get_details (error_code));
ret = FALSE;
goto out;
}
@@ -460,7 +460,7 @@ pk_debuginfo_install_get_repo_list (PkDebuginfoInstallPrivate *priv, GError **er
/* check error code */
error_code = pk_results_get_error_code (results);
if (error_code != NULL) {
- *error = g_error_new (1, 0, "failed to get repo list: %s, %s", pk_error_enum_to_text (pk_error_get_code (error_code)), pk_error_get_details (error_code));
+ *error = g_error_new (1, 0, "failed to get repo list: %s, %s", pk_error_enum_to_string (pk_error_get_code (error_code)), pk_error_get_details (error_code));
goto out;
}
diff --git a/lib/packagekit-glib2/pk-bitfield.c b/lib/packagekit-glib2/pk-bitfield.c
index d54af58..cccd043 100644
--- a/lib/packagekit-glib2/pk-bitfield.c
+++ b/lib/packagekit-glib2/pk-bitfield.c
@@ -104,7 +104,7 @@ pk_bitfield_from_enums (gint value, ...)
}
/**
- * pk_role_bitfield_to_text:
+ * pk_role_bitfield_to_string:
* @roles: The enumerated type values
*
* Converts a enumerated type bitfield to its text representation
@@ -112,7 +112,7 @@ pk_bitfield_from_enums (gint value, ...)
* Return value: the enumerated constant value, e.g. "install-file;update-system"
**/
gchar *
-pk_role_bitfield_to_text (PkBitfield roles)
+pk_role_bitfield_to_string (PkBitfield roles)
{
GString *string;
guint i;
@@ -121,12 +121,12 @@ pk_role_bitfield_to_text (PkBitfield roles)
for (i=0; i<PK_ROLE_ENUM_LAST; i++) {
if ((roles & pk_bitfield_value (i)) == 0)
continue;
- g_string_append_printf (string, "%s;", pk_role_enum_to_text (i));
+ g_string_append_printf (string, "%s;", pk_role_enum_to_string (i));
}
/* do we have a no bitfield? \n */
if (string->len == 0) {
egg_warning ("not valid!");
- g_string_append (string, pk_role_enum_to_text (PK_ROLE_ENUM_UNKNOWN));
+ g_string_append (string, pk_role_enum_to_string (PK_ROLE_ENUM_UNKNOWN));
} else {
/* remove last \n */
g_string_set_size (string, string->len - 1);
@@ -135,7 +135,7 @@ pk_role_bitfield_to_text (PkBitfield roles)
}
/**
- * pk_role_bitfield_from_text:
+ * pk_role_bitfield_from_string:
* @roles: the enumerated constant value, e.g. "available;~gui"
*
* Converts text representation to its enumerated type bitfield
@@ -143,7 +143,7 @@ pk_role_bitfield_to_text (PkBitfield roles)
* Return value: The enumerated type values, or 0 for invalid
**/
PkBitfield
-pk_role_bitfield_from_text (const gchar *roles)
+pk_role_bitfield_from_string (const gchar *roles)
{
PkBitfield roles_enum = 0;
gchar **split;
@@ -159,7 +159,7 @@ pk_role_bitfield_from_text (const gchar *roles)
length = g_strv_length (split);
for (i=0; i<length; i++) {
- role = pk_role_enum_from_text (split[i]);
+ role = pk_role_enum_from_string (split[i]);
if (role == PK_ROLE_ENUM_UNKNOWN) {
roles_enum = 0;
break;
@@ -172,7 +172,7 @@ out:
}
/**
- * pk_groups_bitfield_to_text:
+ * pk_groups_bitfield_to_string:
* @groups: The enumerated type values
*
* Converts a enumerated type bitfield to its text representation
@@ -180,7 +180,7 @@ out:
* Return value: the enumerated constant value, e.g. "gnome;kde"
**/
gchar *
-pk_group_bitfield_to_text (PkBitfield groups)
+pk_group_bitfield_to_string (PkBitfield groups)
{
GString *string;
guint i;
@@ -189,12 +189,12 @@ pk_group_bitfield_to_text (PkBitfield groups)
for (i=0; i<PK_GROUP_ENUM_LAST; i++) {
if ((groups & pk_bitfield_value (i)) == 0)
continue;
- g_string_append_printf (string, "%s;", pk_group_enum_to_text (i));
+ g_string_append_printf (string, "%s;", pk_group_enum_to_string (i));
}
/* do we have a no bitfield? \n */
if (string->len == 0) {
egg_warning ("not valid!");
- g_string_append (string, pk_group_enum_to_text (PK_GROUP_ENUM_UNKNOWN));
+ g_string_append (string, pk_group_enum_to_string (PK_GROUP_ENUM_UNKNOWN));
} else {
/* remove last \n */
g_string_set_size (string, string->len - 1);
@@ -203,7 +203,7 @@ pk_group_bitfield_to_text (PkBitfield groups)
}
/**
- * pk_group_bitfield_from_text:
+ * pk_group_bitfield_from_string:
* @groups: the enumerated constant value, e.g. "available;~gui"
*
* Converts text representation to its enumerated type bitfield
@@ -211,7 +211,7 @@ pk_group_bitfield_to_text (PkBitfield groups)
* Return value: The enumerated type values, or 0 for invalid
**/
PkBitfield
-pk_group_bitfield_from_text (const gchar *groups)
+pk_group_bitfield_from_string (const gchar *groups)
{
PkBitfield groups_enum = 0;
gchar **split;
@@ -227,7 +227,7 @@ pk_group_bitfield_from_text (const gchar *groups)
length = g_strv_length (split);
for (i=0; i<length; i++) {
- group = pk_group_enum_from_text (split[i]);
+ group = pk_group_enum_from_string (split[i]);
if (group == PK_GROUP_ENUM_UNKNOWN) {
groups_enum = 0;
break;
@@ -240,7 +240,7 @@ out:
}
/**
- * pk_filter_bitfield_to_text:
+ * pk_filter_bitfield_to_string:
* @filters: The enumerated type values
*
* Converts a enumerated type bitfield to its text representation
@@ -248,25 +248,25 @@ out:
* Return value: the enumerated constant value, e.g. "available;~gui"
**/
gchar *
-pk_filter_bitfield_to_text (PkBitfield filters)
+pk_filter_bitfield_to_string (PkBitfield filters)
{
GString *string;
guint i;
/* shortcut */
if (filters == 0)
- return g_strdup (pk_filter_enum_to_text (PK_FILTER_ENUM_NONE));
+ return g_strdup (pk_filter_enum_to_string (PK_FILTER_ENUM_NONE));
string = g_string_new ("");
for (i=0; i<PK_FILTER_ENUM_LAST; i++) {
if ((filters & pk_bitfield_value (i)) == 0)
continue;
- g_string_append_printf (string, "%s;", pk_filter_enum_to_text (i));
+ g_string_append_printf (string, "%s;", pk_filter_enum_to_string (i));
}
/* do we have a 'none' filter? \n */
if (string->len == 0) {
egg_warning ("not valid!");
- g_string_append (string, pk_filter_enum_to_text (PK_FILTER_ENUM_NONE));
+ g_string_append (string, pk_filter_enum_to_string (PK_FILTER_ENUM_NONE));
} else {
/* remove last \n */
g_string_set_size (string, string->len - 1);
@@ -275,7 +275,7 @@ pk_filter_bitfield_to_text (PkBitfield filters)
}
/**
- * pk_filter_bitfield_from_text:
+ * pk_filter_bitfield_from_string:
* @filters: the enumerated constant value, e.g. "available;~gui"
*
* Converts text representation to its enumerated type bitfield, or 0 for invalid
@@ -283,7 +283,7 @@ pk_filter_bitfield_to_text (PkBitfield filters)
* Return value: The enumerated type values
**/
PkBitfield
-pk_filter_bitfield_from_text (const gchar *filters)
+pk_filter_bitfield_from_string (const gchar *filters)
{
PkBitfield filters_enum = 0;
gchar **split;
@@ -299,7 +299,7 @@ pk_filter_bitfield_from_text (const gchar *filters)
length = g_strv_length (split);
for (i=0; i<length; i++) {
- filter = pk_filter_enum_from_text (split[i]);
+ filter = pk_filter_enum_from_string (split[i]);
if (filter == PK_FILTER_ENUM_UNKNOWN) {
filters_enum = 0;
break;
@@ -331,7 +331,7 @@ pk_bitfield_test (gpointer user_data)
/************************************************************/
egg_test_title (test, "check we can convert filter bitfield to text (none)");
- text = pk_filter_bitfield_to_text (pk_bitfield_value (PK_FILTER_ENUM_NONE));
+ text = pk_filter_bitfield_to_string (pk_bitfield_value (PK_FILTER_ENUM_NONE));
if (g_strcmp0 (text, "none") == 0)
egg_test_success (test, NULL);
else
@@ -358,7 +358,7 @@ pk_bitfield_test (gpointer user_data)
/************************************************************/
egg_test_title (test, "check we can convert filter bitfield to text (single)");
- text = pk_filter_bitfield_to_text (pk_bitfield_value (PK_FILTER_ENUM_NOT_DEVELOPMENT));
+ text = pk_filter_bitfield_to_string (pk_bitfield_value (PK_FILTER_ENUM_NOT_DEVELOPMENT));
if (g_strcmp0 (text, "~devel") == 0)
egg_test_success (test, NULL);
else
@@ -367,7 +367,7 @@ pk_bitfield_test (gpointer user_data)
/************************************************************/
egg_test_title (test, "check we can convert filter bitfield to text (plural)");
- text = pk_filter_bitfield_to_text (pk_bitfield_value (PK_FILTER_ENUM_NOT_DEVELOPMENT) |
+ text = pk_filter_bitfield_to_string (pk_bitfield_value (PK_FILTER_ENUM_NOT_DEVELOPMENT) |
pk_bitfield_value (PK_FILTER_ENUM_GUI) |
pk_bitfield_value (PK_FILTER_ENUM_NEWEST));
if (g_strcmp0 (text, "~devel;gui;newest") == 0)
@@ -378,7 +378,7 @@ pk_bitfield_test (gpointer user_data)
/************************************************************/
egg_test_title (test, "check we can convert filter text to bitfield (none)");
- filter = pk_filter_bitfield_from_text ("none");
+ filter = pk_filter_bitfield_from_string ("none");
if (filter == pk_bitfield_value (PK_FILTER_ENUM_NONE))
egg_test_success (test, NULL);
else
@@ -386,7 +386,7 @@ pk_bitfield_test (gpointer user_data)
/************************************************************/
egg_test_title (test, "check we can convert filter text to bitfield (single)");
- filter = pk_filter_bitfield_from_text ("~devel");
+ filter = pk_filter_bitfield_from_string ("~devel");
if (filter == pk_bitfield_value (PK_FILTER_ENUM_NOT_DEVELOPMENT))
egg_test_success (test, NULL);
else
@@ -394,7 +394,7 @@ pk_bitfield_test (gpointer user_data)
/************************************************************/
egg_test_title (test, "check we can convert filter text to bitfield (plural)");
- filter = pk_filter_bitfield_from_text ("~devel;gui;newest");
+ filter = pk_filter_bitfield_from_string ("~devel;gui;newest");
if (filter == (pk_bitfield_value (PK_FILTER_ENUM_NOT_DEVELOPMENT) |
pk_bitfield_value (PK_FILTER_ENUM_GUI) |
pk_bitfield_value (PK_FILTER_ENUM_NEWEST)))
@@ -409,7 +409,7 @@ pk_bitfield_test (gpointer user_data)
pk_bitfield_value (PK_FILTER_ENUM_NEWEST);
pk_bitfield_add (filter, PK_FILTER_ENUM_NOT_FREE);
pk_bitfield_remove (filter, PK_FILTER_ENUM_NOT_DEVELOPMENT);
- text = pk_filter_bitfield_to_text (filter);
+ text = pk_filter_bitfield_to_string (filter);
if (g_strcmp0 (text, "gui;~free;newest") == 0)
egg_test_success (test, NULL);
else
@@ -437,7 +437,7 @@ pk_bitfield_test (gpointer user_data)
egg_test_title (test, "check we can add / remove bitfield to nothing");
filter = pk_bitfield_value (PK_FILTER_ENUM_NOT_DEVELOPMENT);
pk_bitfield_remove (filter, PK_FILTER_ENUM_NOT_DEVELOPMENT);
- text = pk_filter_bitfield_to_text (filter);
+ text = pk_filter_bitfield_to_string (filter);
if (g_strcmp0 (text, "none") == 0)
egg_test_success (test, NULL);
else
@@ -480,7 +480,7 @@ pk_bitfield_test (gpointer user_data)
/************************************************************/
egg_test_title (test, "group bitfield to text (unknown)");
values = pk_bitfield_from_enums (PK_GROUP_ENUM_UNKNOWN, -1);
- text = pk_group_bitfield_to_text (values);
+ text = pk_group_bitfield_to_string (values);
if (g_strcmp0 (text, "unknown") == 0)
egg_test_success (test, NULL);
else
@@ -490,7 +490,7 @@ pk_bitfield_test (gpointer user_data)
/************************************************************/
egg_test_title (test, "group bitfield to text (first and last)");
values = pk_bitfield_from_enums (PK_GROUP_ENUM_ACCESSIBILITY, PK_GROUP_ENUM_UNKNOWN, -1);
- text = pk_group_bitfield_to_text (values);
+ text = pk_group_bitfield_to_string (values);
if (g_strcmp0 (text, "unknown;accessibility") == 0)
egg_test_success (test, NULL);
else
@@ -500,7 +500,7 @@ pk_bitfield_test (gpointer user_data)
/************************************************************/
egg_test_title (test, "group bitfield to text (random)");
values = pk_bitfield_from_enums (PK_GROUP_ENUM_UNKNOWN, PK_GROUP_ENUM_REPOS, -1);
- text = pk_group_bitfield_to_text (values);
+ text = pk_group_bitfield_to_string (values);
if (g_strcmp0 (text, "unknown;repos") == 0)
egg_test_success (test, NULL);
else
diff --git a/lib/packagekit-glib2/pk-bitfield.h b/lib/packagekit-glib2/pk-bitfield.h
index 01d9cee..6035818 100644
--- a/lib/packagekit-glib2/pk-bitfield.h
+++ b/lib/packagekit-glib2/pk-bitfield.h
@@ -43,12 +43,12 @@ typedef guint64 PkBitfield;
gint pk_bitfield_contain_priority (PkBitfield values,
gint value, ...);
PkBitfield pk_bitfield_from_enums (gint value, ...);
-PkBitfield pk_role_bitfield_from_text (const gchar *roles);
-gchar *pk_role_bitfield_to_text (PkBitfield roles);
-PkBitfield pk_group_bitfield_from_text (const gchar *groups);
-gchar *pk_group_bitfield_to_text (PkBitfield groups);
-PkBitfield pk_filter_bitfield_from_text (const gchar *filters);
-gchar *pk_filter_bitfield_to_text (PkBitfield filters);
+PkBitfield pk_role_bitfield_from_string (const gchar *roles);
+gchar *pk_role_bitfield_to_string (PkBitfield roles);
+PkBitfield pk_group_bitfield_from_string (const gchar *groups);
+gchar *pk_group_bitfield_to_string (PkBitfield groups);
+PkBitfield pk_filter_bitfield_from_string (const gchar *filters);
+gchar *pk_filter_bitfield_to_string (PkBitfield filters);
void pk_bitfield_test (gpointer user_data);
G_END_DECLS
diff --git a/lib/packagekit-glib2/pk-catalog.c b/lib/packagekit-glib2/pk-catalog.c
index 31de19d..1662de3 100644
--- a/lib/packagekit-glib2/pk-catalog.c
+++ b/lib/packagekit-glib2/pk-catalog.c
@@ -123,10 +123,10 @@ pk_catalog_error_get_type (void)
}
/**
- * pk_catalog_mode_to_text:
+ * pk_catalog_mode_to_string:
**/
static const gchar *
-pk_catalog_mode_to_text (PkCatalogMode mode)
+pk_catalog_mode_to_string (PkCatalogMode mode)
{
if (mode == PK_CATALOG_MODE_PACKAGES)
return "InstallPackages";
@@ -151,7 +151,7 @@ pk_catalog_process_type_part (PkCatalogState *state, PkCatalogMode mode, const g
GPtrArray *array = NULL;
/* make key */
- type = pk_catalog_mode_to_text (mode);
+ type = pk_catalog_mode_to_string (mode);
if (distro_id_part == NULL)
key = g_strdup (type);
else
@@ -689,7 +689,7 @@ pk_catalog_test_progress_cb (PkProgress *progress, PkProgressType type, EggTest
g_object_get (progress,
"status", &status,
NULL);
- egg_debug ("now %s", pk_status_enum_to_text (status));
+ egg_debug ("now %s", pk_status_enum_to_string (status));
}
}
diff --git a/lib/packagekit-glib2/pk-client.c b/lib/packagekit-glib2/pk-client.c
index 4baf3b0..f2c6a41 100644
--- a/lib/packagekit-glib2/pk-client.c
+++ b/lib/packagekit-glib2/pk-client.c
@@ -398,7 +398,7 @@ pk_client_get_properties_collect_cb (const char *key, const GValue *value, PkCli
/* role */
if (g_strcmp0 (key, "Role") == 0) {
- ret = pk_progress_set_role (state->progress, pk_role_enum_from_text (g_value_get_string (value)));
+ ret = pk_progress_set_role (state->progress, pk_role_enum_from_string (g_value_get_string (value)));
if (ret && state->progress_callback != NULL)
state->progress_callback (state->progress, PK_PROGRESS_TYPE_ROLE, state->progress_user_data);
return;
@@ -406,7 +406,7 @@ pk_client_get_properties_collect_cb (const char *key, const GValue *value, PkCli
/* status */
if (g_strcmp0 (key, "Status") == 0) {
- ret = pk_progress_set_status (state->progress, pk_status_enum_from_text (g_value_get_string (value)));
+ ret = pk_progress_set_status (state->progress, pk_status_enum_from_string (g_value_get_string (value)));
if (ret && state->progress_callback != NULL)
state->progress_callback (state->progress, PK_PROGRESS_TYPE_STATUS, state->progress_user_data);
return;
@@ -860,7 +860,7 @@ pk_client_finished_cb (DBusGProxy *proxy, const gchar *exit_text, guint runtime,
egg_debug ("exit_text=%s", exit_text);
/* yay */
- exit_enum = pk_exit_enum_from_text (exit_text);
+ exit_enum = pk_exit_enum_from_string (exit_text);
pk_results_set_exit_code (state->results, exit_enum);
/* failed */
@@ -932,7 +932,7 @@ pk_client_package_cb (DBusGProxy *proxy, const gchar *info_text, const gchar *pa
g_return_if_fail (PK_IS_CLIENT (state->client));
/* add to results */
- info_enum = pk_info_enum_from_text (info_text);
+ info_enum = pk_info_enum_from_string (info_text);
if (info_enum != PK_INFO_ENUM_FINISHED) {
item = pk_package_new ();
g_object_set (item,
@@ -1036,7 +1036,7 @@ pk_client_details_cb (DBusGProxy *proxy, const gchar *package_id, const gchar *l
{
PkGroupEnum group_enum;
PkDetails *item;
- group_enum = pk_group_enum_from_text (group_text);
+ group_enum = pk_group_enum_from_string (group_text);
/* add to results */
item = pk_details_new ();
@@ -1068,8 +1068,8 @@ pk_client_update_detail_cb (DBusGProxy *proxy, const gchar *package_id, const g
PkRestartEnum restart_enum;
PkUpdateDetail *item;
- restart_enum = pk_restart_enum_from_text (restart_text);
- state_enum = pk_update_state_enum_from_text (state_text);
+ restart_enum = pk_restart_enum_from_string (restart_text);
+ state_enum = pk_update_state_enum_from_string (state_text);
/* add to results */
item = pk_update_detail_new ();
@@ -1103,7 +1103,7 @@ pk_client_transaction_cb (DBusGProxy *proxy, const gchar *tid, const gchar *time
{
PkRoleEnum role_enum;
PkTransactionPast *item;
- role_enum = pk_role_enum_from_text (role_text);
+ role_enum = pk_role_enum_from_string (role_text);
/* add to results */
item = pk_transaction_past_new ();
@@ -1132,7 +1132,7 @@ pk_client_distro_upgrade_cb (DBusGProxy *proxy, const gchar *type_text, const gc
{
PkUpdateStateEnum type_enum;
PkDistroUpgrade *item;
- type_enum = pk_update_state_enum_from_text (type_text);
+ type_enum = pk_update_state_enum_from_string (type_text);
/* add to results */
item = pk_distro_upgrade_new ();
@@ -1155,7 +1155,7 @@ pk_client_require_restart_cb (DBusGProxy *proxy, const gchar *restart_text, con
{
PkRestartEnum restart_enum;
PkRequireRestart *item;
- restart_enum = pk_restart_enum_from_text (restart_text);
+ restart_enum = pk_restart_enum_from_string (restart_text);
/* add to results */
item = pk_require_restart_new ();
@@ -1227,7 +1227,7 @@ pk_client_repo_signature_required_cb (DBusGProxy *proxy, const gchar *package_id
{
PkSigTypeEnum type_enum;
PkRepoSignatureRequired *item;
- type_enum = pk_sig_type_enum_from_text (type_text);
+ type_enum = pk_sig_type_enum_from_string (type_text);
/* add to results */
item = pk_repo_signature_required_new ();
@@ -1279,7 +1279,7 @@ pk_client_media_change_required_cb (DBusGProxy *proxy, const gchar *media_type_t
{
PkMediaTypeEnum media_type_enum;
PkMediaChangeRequired *item;
- media_type_enum = pk_media_type_enum_from_text (media_type_text);
+ media_type_enum = pk_media_type_enum_from_string (media_type_text);
/* add to results */
item = pk_media_change_required_new ();
@@ -1324,7 +1324,7 @@ pk_client_error_code_cb (DBusGProxy *proxy, const gchar *code_text, const gchar
{
PkErrorEnum code_enum;
PkError *item;
- code_enum = pk_error_enum_from_text (code_text);
+ code_enum = pk_error_enum_from_string (code_text);
/* add to results */
item = pk_error_new ();
@@ -1346,7 +1346,7 @@ pk_client_message_cb (DBusGProxy *proxy, const gchar *message_text, const gchar
{
PkMessageEnum message_enum;
PkMessage *item;
- message_enum = pk_message_enum_from_text (message_text);
+ message_enum = pk_message_enum_from_string (message_text);
/* add to results */
item = pk_message_new ();
@@ -1544,7 +1544,7 @@ pk_client_set_hints_cb (DBusGProxy *proxy, DBusGProxyCall *call, PkClientState *
/* do this async, although this should be pretty fast anyway */
if (state->role == PK_ROLE_ENUM_RESOLVE) {
- filters_text = pk_filter_bitfield_to_text (state->filters);
+ filters_text = pk_filter_bitfield_to_string (state->filters);
state->call = dbus_g_proxy_begin_call (state->proxy, "Resolve",
(DBusGProxyCallNotify) pk_client_method_cb, state, NULL,
G_TYPE_STRING, filters_text,
@@ -1552,28 +1552,28 @@ pk_client_set_hints_cb (DBusGProxy *proxy, DBusGProxyCall *call, PkClientState *
G_TYPE_INVALID);
g_object_set (state->results, "inputs", g_strv_length (state->package_ids), NULL);
} else if (state->role == PK_ROLE_ENUM_SEARCH_NAME) {
- filters_text = pk_filter_bitfield_to_text (state->filters);
+ filters_text = pk_filter_bitfield_to_string (state->filters);
state->call = dbus_g_proxy_begin_call (state->proxy, "SearchNames",
(DBusGProxyCallNotify) pk_client_method_cb, state, NULL,
G_TYPE_STRING, filters_text,
G_TYPE_STRV, state->search,
G_TYPE_INVALID);
} else if (state->role == PK_ROLE_ENUM_SEARCH_DETAILS) {
- filters_text = pk_filter_bitfield_to_text (state->filters);
+ filters_text = pk_filter_bitfield_to_string (state->filters);
state->call = dbus_g_proxy_begin_call (state->proxy, "SearchDetails",
(DBusGProxyCallNotify) pk_client_method_cb, state, NULL,
G_TYPE_STRING, filters_text,
G_TYPE_STRV, state->search,
G_TYPE_INVALID);
} else if (state->role == PK_ROLE_ENUM_SEARCH_GROUP) {
- filters_text = pk_filter_bitfield_to_text (state->filters);
+ filters_text = pk_filter_bitfield_to_string (state->filters);
state->call = dbus_g_proxy_begin_call (state->proxy, "SearchGroups",
(DBusGProxyCallNotify) pk_client_method_cb, state, NULL,
G_TYPE_STRING, filters_text,
G_TYPE_STRV, state->search,
G_TYPE_INVALID);
} else if (state->role == PK_ROLE_ENUM_SEARCH_FILE) {
- filters_text = pk_filter_bitfield_to_text (state->filters);
+ filters_text = pk_filter_bitfield_to_string (state->filters);
state->call = dbus_g_proxy_begin_call (state->proxy, "SearchFiles",
(DBusGProxyCallNotify) pk_client_method_cb, state, NULL,
G_TYPE_STRING, filters_text,
@@ -1603,7 +1603,7 @@ pk_client_set_hints_cb (DBusGProxy *proxy, DBusGProxyCall *call, PkClientState *
G_TYPE_INVALID);
g_object_set (state->results, "inputs", g_strv_length (state->package_ids), NULL);
} else if (state->role == PK_ROLE_ENUM_GET_UPDATES) {
- filters_text = pk_filter_bitfield_to_text (state->filters);
+ filters_text = pk_filter_bitfield_to_string (state->filters);
state->call = dbus_g_proxy_begin_call (state->proxy, "GetUpdates",
(DBusGProxyCallNotify) pk_client_method_cb, state, NULL,
G_TYPE_STRING, filters_text,
@@ -1614,7 +1614,7 @@ pk_client_set_hints_cb (DBusGProxy *proxy, DBusGProxyCall *call, PkClientState *
G_TYPE_BOOLEAN, state->only_trusted,
G_TYPE_INVALID);
} else if (state->role == PK_ROLE_ENUM_GET_DEPENDS) {
- filters_text = pk_filter_bitfield_to_text (state->filters);
+ filters_text = pk_filter_bitfield_to_string (state->filters);
state->call = dbus_g_proxy_begin_call (state->proxy, "GetDepends",
(DBusGProxyCallNotify) pk_client_method_cb, state, NULL,
G_TYPE_STRING, filters_text,
@@ -1623,13 +1623,13 @@ pk_client_set_hints_cb (DBusGProxy *proxy, DBusGProxyCall *call, PkClientState *
G_TYPE_INVALID);
g_object_set (state->results, "inputs", g_strv_length (state->package_ids), NULL);
} else if (state->role == PK_ROLE_ENUM_GET_PACKAGES) {
- filters_text = pk_filter_bitfield_to_text (state->filters);
+ filters_text = pk_filter_bitfield_to_string (state->filters);
state->call = dbus_g_proxy_begin_call (state->proxy, "GetPackages",
(DBusGProxyCallNotify) pk_client_method_cb, state, NULL,
G_TYPE_STRING, filters_text,
G_TYPE_INVALID);
} else if (state->role == PK_ROLE_ENUM_GET_REQUIRES) {
- filters_text = pk_filter_bitfield_to_text (state->filters);
+ filters_text = pk_filter_bitfield_to_string (state->filters);
state->call = dbus_g_proxy_begin_call (state->proxy, "GetRequires",
(DBusGProxyCallNotify) pk_client_method_cb, state, NULL,
G_TYPE_STRING, filters_text,
@@ -1638,8 +1638,8 @@ pk_client_set_hints_cb (DBusGProxy *proxy, DBusGProxyCall *call, PkClientState *
G_TYPE_INVALID);
g_object_set (state->results, "inputs", g_strv_length (state->package_ids), NULL);
} else if (state->role == PK_ROLE_ENUM_WHAT_PROVIDES) {
- filters_text = pk_filter_bitfield_to_text (state->filters);
- enum_text = pk_provides_enum_to_text (state->provides);
+ filters_text = pk_filter_bitfield_to_string (state->filters);
+ enum_text = pk_provides_enum_to_string (state->provides);
state->call = dbus_g_proxy_begin_call (state->proxy, "WhatProvides",
(DBusGProxyCallNotify) pk_client_method_cb, state, NULL,
G_TYPE_STRING, filters_text,
@@ -1681,7 +1681,7 @@ pk_client_set_hints_cb (DBusGProxy *proxy, DBusGProxyCall *call, PkClientState *
G_TYPE_INVALID);
g_object_set (state->results, "inputs", g_strv_length (state->package_ids), NULL);
} else if (state->role == PK_ROLE_ENUM_INSTALL_SIGNATURE) {
- enum_text = pk_sig_type_enum_to_text (state->type);
+ enum_text = pk_sig_type_enum_to_string (state->type);
state->call = dbus_g_proxy_begin_call (state->proxy, "InstallSignature",
(DBusGProxyCallNotify) pk_client_method_cb, state, NULL,
G_TYPE_STRING, enum_text,
@@ -1713,7 +1713,7 @@ pk_client_set_hints_cb (DBusGProxy *proxy, DBusGProxyCall *call, PkClientState *
G_TYPE_STRING, state->transaction_id,
G_TYPE_INVALID);
} else if (state->role == PK_ROLE_ENUM_GET_REPO_LIST) {
- filters_text = pk_filter_bitfield_to_text (state->filters);
+ filters_text = pk_filter_bitfield_to_string (state->filters);
state->call = dbus_g_proxy_begin_call (state->proxy, "GetRepoList",
(DBusGProxyCallNotify) pk_client_method_cb, state, NULL,
G_TYPE_STRING, filters_text,
@@ -1763,7 +1763,7 @@ pk_client_set_hints_cb (DBusGProxy *proxy, DBusGProxyCall *call, PkClientState *
egg_error ("failed to setup call, maybe OOM or no connection");
/* we've sent this async */
- egg_debug ("new method '%s', started DBus call: %p (%p)", pk_role_enum_to_text (state->role), state, state->call);
+ egg_debug ("new method '%s', started DBus call: %p (%p)", pk_role_enum_to_string (state->role), state, state->call);
out:
g_free (filters_text);
@@ -1771,10 +1771,10 @@ out:
}
/**
- * pk_client_bool_to_text:
+ * pk_client_bool_to_string:
**/
static const gchar *
-pk_client_bool_to_text (gboolean value)
+pk_client_bool_to_string (gboolean value)
{
if (value)
return "true";
@@ -1829,11 +1829,11 @@ pk_client_get_tid_cb (GObject *object, GAsyncResult *res, PkClientState *state)
}
/* background */
- hint = g_strdup_printf ("background=%s", pk_client_bool_to_text (state->client->priv->background));
+ hint = g_strdup_printf ("background=%s", pk_client_bool_to_string (state->client->priv->background));
g_ptr_array_add (array, hint);
/* interactive */
- hint = g_strdup_printf ("interactive=%s", pk_client_bool_to_text (state->client->priv->interactive));
+ hint = g_strdup_printf ("interactive=%s", pk_client_bool_to_string (state->client->priv->interactive));
g_ptr_array_add (array, hint);
/* set hints */
@@ -4085,7 +4085,7 @@ pk_client_test_resolve_cb (GObject *object, GAsyncResult *res, EggTest *test)
exit_enum = pk_results_get_exit_code (results);
if (exit_enum != PK_EXIT_ENUM_SUCCESS)
- egg_test_failed (test, "failed to resolve success: %s", pk_exit_enum_to_text (exit_enum));
+ egg_test_failed (test, "failed to resolve success: %s", pk_exit_enum_to_string (exit_enum));
packages = pk_results_get_package_array (results);
if (packages == NULL)
@@ -4101,7 +4101,7 @@ pk_client_test_resolve_cb (GObject *object, GAsyncResult *res, EggTest *test)
g_ptr_array_unref (packages);
- egg_debug ("results exit enum = %s", pk_exit_enum_to_text (exit_enum));
+ egg_debug ("results exit enum = %s", pk_exit_enum_to_string (exit_enum));
out:
if (results != NULL)
g_object_unref (results);
@@ -4127,7 +4127,7 @@ pk_client_test_get_details_cb (GObject *object, GAsyncResult *res, EggTest *test
exit_enum = pk_results_get_exit_code (results);
if (exit_enum != PK_EXIT_ENUM_SUCCESS)
- egg_test_failed (test, "failed to get details: %s", pk_exit_enum_to_text (exit_enum));
+ egg_test_failed (test, "failed to get details: %s", pk_exit_enum_to_string (exit_enum));
details = pk_results_get_details_array (results);
if (details == NULL)
@@ -4138,7 +4138,7 @@ pk_client_test_get_details_cb (GObject *object, GAsyncResult *res, EggTest *test
g_ptr_array_unref (details);
- egg_debug ("results exit enum = %s", pk_exit_enum_to_text (exit_enum));
+ egg_debug ("results exit enum = %s", pk_exit_enum_to_string (exit_enum));
out:
if (results != NULL)
g_object_unref (results);
@@ -4165,7 +4165,7 @@ pk_client_test_get_updates_cb (GObject *object, GAsyncResult *res, EggTest *test
exit_enum = pk_results_get_exit_code (results);
if (exit_enum != PK_EXIT_ENUM_SUCCESS)
- egg_test_failed (test, "failed to get updates: %s", pk_exit_enum_to_text (exit_enum));
+ egg_test_failed (test, "failed to get updates: %s", pk_exit_enum_to_string (exit_enum));
sack = pk_results_get_package_sack (results);
if (sack == NULL)
@@ -4178,7 +4178,7 @@ pk_client_test_get_updates_cb (GObject *object, GAsyncResult *res, EggTest *test
g_object_unref (sack);
- egg_debug ("results exit enum = %s", pk_exit_enum_to_text (exit_enum));
+ egg_debug ("results exit enum = %s", pk_exit_enum_to_string (exit_enum));
out:
if (results != NULL)
g_object_unref (results);
@@ -4204,7 +4204,7 @@ pk_client_test_search_name_cb (GObject *object, GAsyncResult *res, EggTest *test
exit_enum = pk_results_get_exit_code (results);
if (exit_enum != PK_EXIT_ENUM_CANCELLED)
- egg_test_failed (test, "failed to cancel search: %s", pk_exit_enum_to_text (exit_enum));
+ egg_test_failed (test, "failed to cancel search: %s", pk_exit_enum_to_string (exit_enum));
/* check error code */
error_code = pk_results_get_error_code (results);
@@ -4280,7 +4280,7 @@ pk_client_test_download_cb (GObject *object, GAsyncResult *res, EggTest *test)
exit_enum = pk_results_get_exit_code (results);
if (exit_enum != PK_EXIT_ENUM_SUCCESS)
- egg_test_failed (test, "failed to download: %s", pk_exit_enum_to_text (exit_enum));
+ egg_test_failed (test, "failed to download: %s", pk_exit_enum_to_string (exit_enum));
/* check number */
array = pk_results_get_files_array (results);
@@ -4408,7 +4408,7 @@ pk_client_test (gpointer user_data)
/************************************************************/
egg_test_title (test, "resolve package");
- package_ids = pk_package_ids_from_text ("glib2;2.14.0;i386;fedora&powertop");
+ package_ids = pk_package_ids_from_string ("glib2;2.14.0;i386;fedora&powertop");
pk_client_resolve_async (client, pk_bitfield_value (PK_FILTER_ENUM_INSTALLED), package_ids, NULL,
(PkProgressCallback) pk_client_test_progress_cb, test,
(GAsyncReadyCallback) pk_client_test_resolve_cb, test);
@@ -4432,9 +4432,9 @@ pk_client_test (gpointer user_data)
if (g_strcmp0 (tid, _tid) != 0)
egg_test_failed (test, "incorrect transaction-id, got %s, expected %s", tid, _tid);
if (role != PK_ROLE_ENUM_RESOLVE)
- egg_test_failed (test, "incorrect role, got %s", pk_role_enum_to_text (role));
+ egg_test_failed (test, "incorrect role, got %s", pk_role_enum_to_string (role));
if (status != PK_STATUS_ENUM_FINISHED)
- egg_test_failed (test, "incorrect status, got %s", pk_status_enum_to_text (status));
+ egg_test_failed (test, "incorrect status, got %s", pk_status_enum_to_string (status));
egg_test_success (test, "got progress in %i", egg_test_elapsed (test));
g_object_unref (progress);
g_free (tid);
diff --git a/lib/packagekit-glib2/pk-console-shared.c b/lib/packagekit-glib2/pk-console-shared.c
index e0d6b21..f6c36b3 100644
--- a/lib/packagekit-glib2/pk-console-shared.c
+++ b/lib/packagekit-glib2/pk-console-shared.c
@@ -394,7 +394,7 @@ pk_status_enum_to_localised_text (PkStatusEnum status)
text = _("Copying files");
break;
default:
- egg_warning ("status unrecognised: %s", pk_status_enum_to_text (status));
+ egg_warning ("status unrecognised: %s", pk_status_enum_to_string (status));
}
return text;
}
@@ -446,7 +446,7 @@ pk_info_enum_to_localised_text (PkInfoEnum info)
text = _("Available");
break;
default:
- egg_warning ("info unrecognised: %s", pk_info_enum_to_text (info));
+ egg_warning ("info unrecognised: %s", pk_info_enum_to_string (info));
}
return text;
}
@@ -684,7 +684,7 @@ pk_role_enum_to_localised_present (PkRoleEnum role)
text = _("Simulating update");
break;
default:
- egg_warning ("role unrecognised: %s", pk_role_enum_to_text (role));
+ egg_warning ("role unrecognised: %s", pk_role_enum_to_string (role));
}
return text;
}
diff --git a/lib/packagekit-glib2/pk-control.c b/lib/packagekit-glib2/pk-control.c
index e0864b5..5fb100e 100644
--- a/lib/packagekit-glib2/pk-control.c
+++ b/lib/packagekit-glib2/pk-control.c
@@ -875,7 +875,7 @@ pk_control_get_time_since_action_async (PkControl *control, PkRoleEnum role, GCa
}
/* call D-Bus get_time_since_action async */
- role_text = pk_role_enum_to_text (role);
+ role_text = pk_role_enum_to_string (role);
state->call = dbus_g_proxy_begin_call (control->priv->proxy, "GetTimeSinceAction",
(DBusGProxyCallNotify) pk_control_get_time_since_action_cb, state, NULL,
G_TYPE_STRING, role_text,
@@ -983,7 +983,7 @@ pk_control_can_authorize_cb (DBusGProxy *proxy, DBusGProxyCall *call, PkControlS
}
/* save data */
- state->authorize = pk_authorize_type_enum_from_text (authorize_state);
+ state->authorize = pk_authorize_type_enum_from_string (authorize_state);
if (state->authorize == PK_AUTHORIZE_ENUM_UNKNOWN) {
error = g_error_new (PK_CONTROL_ERROR, PK_CONTROL_ERROR_FAILED, "could not get state");
pk_control_can_authorize_state_finish (state, error);
@@ -1344,15 +1344,15 @@ pk_control_get_properties_collect_cb (const char *key, const GValue *value, PkCo
} else if (g_strcmp0 (key, "MimeTypes") == 0) {
pk_control_set_mime_types (control, g_value_get_string (value));
} else if (g_strcmp0 (key, "Roles") == 0) {
- pk_control_set_roles (control, pk_role_bitfield_from_text (g_value_get_string (value)));
+ pk_control_set_roles (control, pk_role_bitfield_from_string (g_value_get_string (value)));
} else if (g_strcmp0 (key, "Groups") == 0) {
- pk_control_set_groups (control, pk_group_bitfield_from_text (g_value_get_string (value)));
+ pk_control_set_groups (control, pk_group_bitfield_from_string (g_value_get_string (value)));
} else if (g_strcmp0 (key, "Filters") == 0) {
- pk_control_set_filters (control, pk_filter_bitfield_from_text (g_value_get_string (value)));
+ pk_control_set_filters (control, pk_filter_bitfield_from_string (g_value_get_string (value)));
} else if (g_strcmp0 (key, "Locked") == 0) {
pk_control_set_locked (control, g_value_get_boolean (value));
} else if (g_strcmp0 (key, "NetworkState") == 0) {
- pk_control_set_network_state (control, pk_network_enum_from_text (g_value_get_string (value)));
+ pk_control_set_network_state (control, pk_network_enum_from_string (g_value_get_string (value)));
} else if (g_strcmp0 (key, "DistroId") == 0) {
pk_control_set_distro_id (control, g_value_get_string (value));
} else {
@@ -2247,7 +2247,7 @@ pk_control_test_get_properties_cb (GObject *object, GAsyncResult *res, EggTest *
g_free (text);
/* check roles */
- text = pk_role_bitfield_to_text (roles);
+ text = pk_role_bitfield_to_string (roles);
if (g_strcmp0 (text, "cancel;get-depends;get-details;get-files;get-packages;get-repo-list;"
"get-requires;get-update-detail;get-updates;install-files;install-packages;install-signature;"
"refresh-cache;remove-packages;repo-enable;repo-set-data;resolve;rollback;"
@@ -2260,7 +2260,7 @@ pk_control_test_get_properties_cb (GObject *object, GAsyncResult *res, EggTest *
g_free (text);
/* check filters */
- text = pk_filter_bitfield_to_text (filters);
+ text = pk_filter_bitfield_to_string (filters);
if (g_strcmp0 (text, "installed;devel;gui") != 0) {
egg_test_failed (test, "data incorrect: %s", text);
return;
@@ -2268,7 +2268,7 @@ pk_control_test_get_properties_cb (GObject *object, GAsyncResult *res, EggTest *
g_free (text);
/* check groups */
- text = pk_group_bitfield_to_text (groups);
+ text = pk_group_bitfield_to_string (groups);
if (g_strcmp0 (text, "accessibility;games;system") != 0) {
egg_test_failed (test, "data incorrect: %s", text);
return;
@@ -2422,7 +2422,7 @@ pk_control_test (gpointer user_data)
NULL);
/* check data */
- text = pk_role_bitfield_to_text (roles);
+ text = pk_role_bitfield_to_string (roles);
if (g_strcmp0 (text, "cancel;get-depends;get-details;get-files;get-packages;get-repo-list;"
"get-requires;get-update-detail;get-updates;install-files;install-packages;install-signature;"
"refresh-cache;remove-packages;repo-enable;repo-set-data;resolve;rollback;"
diff --git a/lib/packagekit-glib2/pk-enum.c b/lib/packagekit-glib2/pk-enum.c
index e173565..9478bd7 100644
--- a/lib/packagekit-glib2/pk-enum.c
+++ b/lib/packagekit-glib2/pk-enum.c
@@ -622,7 +622,7 @@ pk_enum_find_string (const PkEnumMatch *table, guint value)
}
/**
- * pk_sig_type_enum_from_text:
+ * pk_sig_type_enum_from_string:
* @sig_type: Text describing the enumerated type
*
* Converts a text enumerated type to its unsigned integer representation
@@ -630,13 +630,13 @@ pk_enum_find_string (const PkEnumMatch *table, guint value)
* Return value: the enumerated constant value, e.g. PK_SIGTYPE_ENUM_GPG
*/
PkSigTypeEnum
-pk_sig_type_enum_from_text (const gchar *sig_type)
+pk_sig_type_enum_from_string (const gchar *sig_type)
{
return pk_enum_find_value (enum_sig_type, sig_type);
}
/**
- * pk_sig_type_enum_to_text:
+ * pk_sig_type_enum_to_string:
* @sig_type: The enumerated type value
*
* Converts a enumerated type to its text representation
@@ -644,13 +644,13 @@ pk_sig_type_enum_from_text (const gchar *sig_type)
* Return value: the enumerated constant value, e.g. "available"
**/
const gchar *
-pk_sig_type_enum_to_text (PkSigTypeEnum sig_type)
+pk_sig_type_enum_to_string (PkSigTypeEnum sig_type)
{
return pk_enum_find_string (enum_sig_type, sig_type);
}
/**
- * pk_distro_upgrade_enum_from_text:
+ * pk_distro_upgrade_enum_from_string:
* @upgrade: Text describing the enumerated type
*
* Converts a text enumerated type to its unsigned integer representation
@@ -658,13 +658,13 @@ pk_sig_type_enum_to_text (PkSigTypeEnum sig_type)
* Return value: the enumerated constant value, e.g. PK_DISTRO_UPGRADE_ENUM_STABLE
*/
PkDistroUpgradeEnum
-pk_distro_upgrade_enum_from_text (const gchar *upgrade)
+pk_distro_upgrade_enum_from_string (const gchar *upgrade)
{
return pk_enum_find_value (enum_upgrade, upgrade);
}
/**
- * pk_distro_upgrade_enum_to_text:
+ * pk_distro_upgrade_enum_to_string:
* @upgrade: The enumerated type value
*
* Converts a enumerated type to its text representation
@@ -672,13 +672,13 @@ pk_distro_upgrade_enum_from_text (const gchar *upgrade)
* Return value: the enumerated constant value, e.g. "stable"
**/
const gchar *
-pk_distro_upgrade_enum_to_text (PkDistroUpgradeEnum upgrade)
+pk_distro_upgrade_enum_to_string (PkDistroUpgradeEnum upgrade)
{
return pk_enum_find_string (enum_upgrade, upgrade);
}
/**
- * pk_provides_enum_from_text:
+ * pk_provides_enum_from_string:
* @provides: Text describing the enumerated type
*
* Converts a text enumerated type to its unsigned integer representation
@@ -686,13 +686,13 @@ pk_distro_upgrade_enum_to_text (PkDistroUpgradeEnum upgrade)
* Return value: the enumerated constant value, e.g. PK_PROVIDES_ENUM_MODALIAS
*/
PkProvidesEnum
-pk_provides_enum_from_text (const gchar *provides)
+pk_provides_enum_from_string (const gchar *provides)
{
return pk_enum_find_value (enum_provides, provides);
}
/**
- * pk_provides_enum_to_text:
+ * pk_provides_enum_to_string:
* @provides: The enumerated type value
*
* Converts a enumerated type to its text representation
@@ -700,13 +700,13 @@ pk_provides_enum_from_text (const gchar *provides)
* Return value: the enumerated constant value, e.g. "codec"
**/
const gchar *
-pk_provides_enum_to_text (PkProvidesEnum provides)
+pk_provides_enum_to_string (PkProvidesEnum provides)
{
return pk_enum_find_string (enum_provides, provides);
}
/**
- * pk_info_enum_from_text:
+ * pk_info_enum_from_string:
* @info: Text describing the enumerated type
*
* Converts a text enumerated type to its unsigned integer representation
@@ -714,13 +714,13 @@ pk_provides_enum_to_text (PkProvidesEnum provides)
* Return value: the enumerated constant value, e.g. PK_SIGTYPE_ENUM_GPG
*/
PkInfoEnum
-pk_info_enum_from_text (const gchar *info)
+pk_info_enum_from_string (const gchar *info)
{
return pk_enum_find_value (enum_info, info);
}
/**
- * pk_info_enum_to_text:
+ * pk_info_enum_to_string:
* @info: The enumerated type value
*
* Converts a enumerated type to its text representation
@@ -728,13 +728,13 @@ pk_info_enum_from_text (const gchar *info)
* Return value: the enumerated constant value, e.g. "available"
**/
const gchar *
-pk_info_enum_to_text (PkInfoEnum info)
+pk_info_enum_to_string (PkInfoEnum info)
{
return pk_enum_find_string (enum_info, info);
}
/**
- * pk_exit_enum_from_text:
+ * pk_exit_enum_from_string:
* @exit: Text describing the enumerated type
*
* Converts a text enumerated type to its unsigned integer representation
@@ -742,13 +742,13 @@ pk_info_enum_to_text (PkInfoEnum info)
* Return value: the enumerated constant value, e.g. PK_SIGTYPE_ENUM_GPG
*/
PkExitEnum
-pk_exit_enum_from_text (const gchar *exit_text)
+pk_exit_enum_from_string (const gchar *exit_text)
{
return pk_enum_find_value (enum_exit, exit_text);
}
/**
- * pk_exit_enum_to_text:
+ * pk_exit_enum_to_string:
* @exit: The enumerated type value
*
* Converts a enumerated type to its text representation
@@ -756,13 +756,13 @@ pk_exit_enum_from_text (const gchar *exit_text)
* Return value: the enumerated constant value, e.g. "available"
**/
const gchar *
-pk_exit_enum_to_text (PkExitEnum exit_enum)
+pk_exit_enum_to_string (PkExitEnum exit_enum)
{
return pk_enum_find_string (enum_exit, exit_enum);
}
/**
- * pk_network_enum_from_text:
+ * pk_network_enum_from_string:
* @network: Text describing the enumerated type
*
* Converts a text enumerated type to its unsigned integer representation
@@ -770,13 +770,13 @@ pk_exit_enum_to_text (PkExitEnum exit_enum)
* Return value: the enumerated constant value, e.g. PK_SIGTYPE_ENUM_GPG
*/
PkNetworkEnum
-pk_network_enum_from_text (const gchar *network)
+pk_network_enum_from_string (const gchar *network)
{
return pk_enum_find_value (enum_network, network);
}
/**
- * pk_network_enum_to_text:
+ * pk_network_enum_to_string:
* @network: The enumerated type value
*
* Converts a enumerated type to its text representation
@@ -784,13 +784,13 @@ pk_network_enum_from_text (const gchar *network)
* Return value: the enumerated constant value, e.g. "available"
**/
const gchar *
-pk_network_enum_to_text (PkNetworkEnum network)
+pk_network_enum_to_string (PkNetworkEnum network)
{
return pk_enum_find_string (enum_network, network);
}
/**
- * pk_status_enum_from_text:
+ * pk_status_enum_from_string:
* @status: Text describing the enumerated type
*
* Converts a text enumerated type to its unsigned integer representation
@@ -798,13 +798,13 @@ pk_network_enum_to_text (PkNetworkEnum network)
* Return value: the enumerated constant value, e.g. PK_SIGTYPE_ENUM_GPG
**/
PkStatusEnum
-pk_status_enum_from_text (const gchar *status)
+pk_status_enum_from_string (const gchar *status)
{
return pk_enum_find_value (enum_status, status);
}
/**
- * pk_status_enum_to_text:
+ * pk_status_enum_to_string:
* @status: The enumerated type value
*
* Converts a enumerated type to its text representation
@@ -812,13 +812,13 @@ pk_status_enum_from_text (const gchar *status)
* Return value: the enumerated constant value, e.g. "available"
**/
const gchar *
-pk_status_enum_to_text (PkStatusEnum status)
+pk_status_enum_to_string (PkStatusEnum status)
{
return pk_enum_find_string (enum_status, status);
}
/**
- * pk_role_enum_from_text:
+ * pk_role_enum_from_string:
* @role: Text describing the enumerated type
*
* Converts a text enumerated type to its unsigned integer representation
@@ -826,13 +826,13 @@ pk_status_enum_to_text (PkStatusEnum status)
* Return value: the enumerated constant value, e.g. PK_SIGTYPE_ENUM_GPG
**/
PkRoleEnum
-pk_role_enum_from_text (const gchar *role)
+pk_role_enum_from_string (const gchar *role)
{
return pk_enum_find_value (enum_role, role);
}
/**
- * pk_role_enum_to_text:
+ * pk_role_enum_to_string:
* @role: The enumerated type value
*
* Converts a enumerated type to its text representation
@@ -840,13 +840,13 @@ pk_role_enum_from_text (const gchar *role)
* Return value: the enumerated constant value, e.g. "available"
**/
const gchar *
-pk_role_enum_to_text (PkRoleEnum role)
+pk_role_enum_to_string (PkRoleEnum role)
{
return pk_enum_find_string (enum_role, role);
}
/**
- * pk_error_enum_from_text:
+ * pk_error_enum_from_string:
* @code: Text describing the enumerated type
*
* Converts a text enumerated type to its unsigned integer representation
@@ -854,13 +854,13 @@ pk_role_enum_to_text (PkRoleEnum role)
* Return value: the enumerated constant value, e.g. PK_SIGTYPE_ENUM_GPG
**/
PkErrorEnum
-pk_error_enum_from_text (const gchar *code)
+pk_error_enum_from_string (const gchar *code)
{
return pk_enum_find_value (enum_error, code);
}
/**
- * pk_error_enum_to_text:
+ * pk_error_enum_to_string:
* @code: The enumerated type value
*
* Converts a enumerated type to its text representation
@@ -868,13 +868,13 @@ pk_error_enum_from_text (const gchar *code)
* Return value: the enumerated constant value, e.g. "available"
**/
const gchar *
-pk_error_enum_to_text (PkErrorEnum code)
+pk_error_enum_to_string (PkErrorEnum code)
{
return pk_enum_find_string (enum_error, code);
}
/**
- * pk_restart_enum_from_text:
+ * pk_restart_enum_from_string:
* @restart: Text describing the enumerated type
*
* Converts a text enumerated type to its unsigned integer representation
@@ -882,13 +882,13 @@ pk_error_enum_to_text (PkErrorEnum code)
* Return value: the enumerated constant value, e.g. PK_SIGTYPE_ENUM_GPG
**/
PkRestartEnum
-pk_restart_enum_from_text (const gchar *restart)
+pk_restart_enum_from_string (const gchar *restart)
{
return pk_enum_find_value (enum_restart, restart);
}
/**
- * pk_restart_enum_to_text:
+ * pk_restart_enum_to_string:
* @restart: The enumerated type value
*
* Converts a enumerated type to its text representation
@@ -896,13 +896,13 @@ pk_restart_enum_from_text (const gchar *restart)
* Return value: the enumerated constant value, e.g. "available"
**/
const gchar *
-pk_restart_enum_to_text (PkRestartEnum restart)
+pk_restart_enum_to_string (PkRestartEnum restart)
{
return pk_enum_find_string (enum_restart, restart);
}
/**
- * pk_message_enum_from_text:
+ * pk_message_enum_from_string:
* @message: Text describing the enumerated type
*
* Converts a text enumerated type to its unsigned integer representation
@@ -910,13 +910,13 @@ pk_restart_enum_to_text (PkRestartEnum restart)
* Return value: the enumerated constant value, e.g. PK_SIGTYPE_ENUM_GPG
**/
PkMessageEnum
-pk_message_enum_from_text (const gchar *message)
+pk_message_enum_from_string (const gchar *message)
{
return pk_enum_find_value (enum_message, message);
}
/**
- * pk_message_enum_to_text:
+ * pk_message_enum_to_string:
* @message: The enumerated type value
*
* Converts a enumerated type to its text representation
@@ -924,13 +924,13 @@ pk_message_enum_from_text (const gchar *message)
* Return value: the enumerated constant value, e.g. "available"
**/
const gchar *
-pk_message_enum_to_text (PkMessageEnum message)
+pk_message_enum_to_string (PkMessageEnum message)
{
return pk_enum_find_string (enum_message, message);
}
/**
- * pk_group_enum_from_text:
+ * pk_group_enum_from_string:
* @group: Text describing the enumerated type
*
* Converts a text enumerated type to its unsigned integer representation
@@ -938,13 +938,13 @@ pk_message_enum_to_text (PkMessageEnum message)
* Return value: the enumerated constant value, e.g. PK_SIGTYPE_ENUM_GPG
**/
PkGroupEnum
-pk_group_enum_from_text (const gchar *group)
+pk_group_enum_from_string (const gchar *group)
{
return pk_enum_find_value (enum_group, group);
}
/**
- * pk_group_enum_to_text:
+ * pk_group_enum_to_string:
* @group: The enumerated type value
*
* Converts a enumerated type to its text representation
@@ -952,13 +952,13 @@ pk_group_enum_from_text (const gchar *group)
* Return value: the enumerated constant value, e.g. "available"
**/
const gchar *
-pk_group_enum_to_text (PkGroupEnum group)
+pk_group_enum_to_string (PkGroupEnum group)
{
return pk_enum_find_string (enum_group, group);
}
/**
- * pk_update_state_enum_from_text:
+ * pk_update_state_enum_from_string:
* @update_state: Text describing the enumerated type
*
* Converts a text enumerated type to its unsigned integer representation
@@ -966,13 +966,13 @@ pk_group_enum_to_text (PkGroupEnum group)
* Return value: the enumerated constant value, e.g. %PK_UPDATE_STATE_ENUM_STABLE
**/
PkUpdateStateEnum
-pk_update_state_enum_from_text (const gchar *update_state)
+pk_update_state_enum_from_string (const gchar *update_state)
{
return pk_enum_find_value (enum_update_state, update_state);
}
/**
- * pk_update_state_enum_to_text:
+ * pk_update_state_enum_to_string:
* @update_state: The enumerated type value
*
* Converts a enumerated type to its text representation
@@ -980,13 +980,13 @@ pk_update_state_enum_from_text (const gchar *update_state)
* Return value: the enumerated constant value, e.g. "testing"
**/
const gchar *
-pk_update_state_enum_to_text (PkUpdateStateEnum update_state)
+pk_update_state_enum_to_string (PkUpdateStateEnum update_state)
{
return pk_enum_find_string (enum_update_state, update_state);
}
/**
- * pk_filter_enum_from_text:
+ * pk_filter_enum_from_string:
* @filter: Text describing the enumerated type
*
* Converts a text enumerated type to its unsigned integer representation
@@ -994,13 +994,13 @@ pk_update_state_enum_to_text (PkUpdateStateEnum update_state)
* Return value: the enumerated constant value, e.g. PK_SIGTYPE_ENUM_GPG
**/
PkFilterEnum
-pk_filter_enum_from_text (const gchar *filter)
+pk_filter_enum_from_string (const gchar *filter)
{
return pk_enum_find_value (enum_filter, filter);
}
/**
- * pk_filter_enum_to_text:
+ * pk_filter_enum_to_string:
* @filter: The enumerated type value
*
* Converts a enumerated type to its text representation
@@ -1008,13 +1008,13 @@ pk_filter_enum_from_text (const gchar *filter)
* Return value: the enumerated constant value, e.g. "available"
**/
const gchar *
-pk_filter_enum_to_text (PkFilterEnum filter)
+pk_filter_enum_to_string (PkFilterEnum filter)
{
return pk_enum_find_string (enum_filter, filter);
}
/**
- * pk_license_enum_from_text:
+ * pk_license_enum_from_string:
* @license: Text describing the enumerated type
*
* Converts a text enumerated type to its unsigned integer representation
@@ -1022,13 +1022,13 @@ pk_filter_enum_to_text (PkFilterEnum filter)
* Return value: the enumerated constant value, e.g. PK_SIGTYPE_ENUM_GPG
**/
PkLicenseEnum
-pk_license_enum_from_text (const gchar *license)
+pk_license_enum_from_string (const gchar *license)
{
return pk_enum_find_value (enum_free_licenses, license);
}
/**
- * pk_license_enum_to_text:
+ * pk_license_enum_to_string:
* @license: The enumerated type value
*
* Converts a enumerated type to its text representation
@@ -1036,13 +1036,13 @@ pk_license_enum_from_text (const gchar *license)
* Return value: the enumerated constant value, e.g. "available"
**/
const gchar *
-pk_license_enum_to_text (PkLicenseEnum license)
+pk_license_enum_to_string (PkLicenseEnum license)
{
return pk_enum_find_string (enum_free_licenses, license);
}
/**
- * pk_media_type_enum_from_text:
+ * pk_media_type_enum_from_string:
* @code: Text describing the enumerated type
*
* Converts a text enumerated type to its unsigned integer representation
@@ -1050,13 +1050,13 @@ pk_license_enum_to_text (PkLicenseEnum license)
* Return value: the enumerated constant value, e.g. PK_MEDIA_TYPE_ENUM_CD
**/
PkMediaTypeEnum
-pk_media_type_enum_from_text (const gchar *media_type)
+pk_media_type_enum_from_string (const gchar *media_type)
{
return pk_enum_find_value (enum_media_type, media_type);
}
/**
- * pk_media_type_enum_to_text:
+ * pk_media_type_enum_to_string:
* @code: The enumerated type value
*
* Converts a enumerated type to its text representation
@@ -1064,13 +1064,13 @@ pk_media_type_enum_from_text (const gchar *media_type)
* Return value: the enumerated constant value, e.g. "dvd"
**/
const gchar *
-pk_media_type_enum_to_text (PkMediaTypeEnum media_type)
+pk_media_type_enum_to_string (PkMediaTypeEnum media_type)
{
return pk_enum_find_string (enum_media_type, media_type);
}
/**
- * pk_authorize_type_enum_from_text:
+ * pk_authorize_type_enum_from_string:
* @code: Text describing the enumerated type
*
* Converts a text enumerated type to its unsigned integer representation
@@ -1078,13 +1078,13 @@ pk_media_type_enum_to_text (PkMediaTypeEnum media_type)
* Return value: the enumerated constant value, e.g. PK_AUTHORIZE_ENUM_YES
**/
PkAuthorizeEnum
-pk_authorize_type_enum_from_text (const gchar *authorize_type)
+pk_authorize_type_enum_from_string (const gchar *authorize_type)
{
return pk_enum_find_value (enum_authorize_type, authorize_type);
}
/**
- * pk_authorize_type_enum_to_text:
+ * pk_authorize_type_enum_to_string:
* @code: The enumerated type value
*
* Converts a enumerated type to its text representation
@@ -1092,7 +1092,7 @@ pk_authorize_type_enum_from_text (const gchar *authorize_type)
* Return value: the enumerated constant value, e.g. "yes"
**/
const gchar *
-pk_authorize_type_enum_to_text (PkAuthorizeEnum authorize_type)
+pk_authorize_type_enum_to_string (PkAuthorizeEnum authorize_type)
{
return pk_enum_find_string (enum_authorize_type, authorize_type);
}
@@ -1132,7 +1132,7 @@ pk_enum_test (gpointer user_data)
/************************************************************/
egg_test_title (test, "find value");
- role_value = pk_role_enum_from_text ("search-file");
+ role_value = pk_role_enum_from_string ("search-file");
if (role_value == PK_ROLE_ENUM_SEARCH_FILE)
egg_test_success (test, NULL);
else
@@ -1140,7 +1140,7 @@ pk_enum_test (gpointer user_data)
/************************************************************/
egg_test_title (test, "find string");
- string = pk_role_enum_to_text (PK_ROLE_ENUM_SEARCH_FILE);
+ string = pk_role_enum_to_string (PK_ROLE_ENUM_SEARCH_FILE);
if (g_strcmp0 (string, "search-file") == 0)
egg_test_success (test, NULL);
else
@@ -1149,7 +1149,7 @@ pk_enum_test (gpointer user_data)
/************************************************************/
egg_test_title (test, "check we convert all the role bitfield");
for (i=1; i<PK_ROLE_ENUM_LAST; i++) {
- string = pk_role_enum_to_text (i);
+ string = pk_role_enum_to_string (i);
if (string == NULL) {
egg_test_failed (test, "failed to get %i", i);
break;
@@ -1160,7 +1160,7 @@ pk_enum_test (gpointer user_data)
/************************************************************/
egg_test_title (test, "check we convert all the status bitfield");
for (i=1; i<PK_STATUS_ENUM_LAST; i++) {
- string = pk_status_enum_to_text (i);
+ string = pk_status_enum_to_string (i);
if (string == NULL) {
egg_test_failed (test, "failed to get %i", i);
break;
@@ -1171,7 +1171,7 @@ pk_enum_test (gpointer user_data)
/************************************************************/
egg_test_title (test, "check we convert all the exit bitfield");
for (i=0; i<PK_EXIT_ENUM_LAST; i++) {
- string = pk_exit_enum_to_text (i);
+ string = pk_exit_enum_to_string (i);
if (string == NULL) {
egg_test_failed (test, "failed to get %i", i);
break;
@@ -1182,7 +1182,7 @@ pk_enum_test (gpointer user_data)
/************************************************************/
egg_test_title (test, "check we convert all the filter bitfield");
for (i=0; i<PK_FILTER_ENUM_LAST; i++) {
- string = pk_filter_enum_to_text (i);
+ string = pk_filter_enum_to_string (i);
if (string == NULL) {
egg_test_failed (test, "failed to get %i", i);
break;
@@ -1193,7 +1193,7 @@ pk_enum_test (gpointer user_data)
/************************************************************/
egg_test_title (test, "check we convert all the restart bitfield");
for (i=0; i<PK_RESTART_ENUM_LAST; i++) {
- string = pk_restart_enum_to_text (i);
+ string = pk_restart_enum_to_string (i);
if (string == NULL) {
egg_test_failed (test, "failed to get %i", i);
break;
@@ -1204,7 +1204,7 @@ pk_enum_test (gpointer user_data)
/************************************************************/
egg_test_title (test, "check we convert all the error_code bitfield");
for (i=0; i<PK_ERROR_ENUM_LAST; i++) {
- string = pk_error_enum_to_text (i);
+ string = pk_error_enum_to_string (i);
if (string == NULL) {
egg_test_failed (test, "failed to get %i", i);
break;
@@ -1215,7 +1215,7 @@ pk_enum_test (gpointer user_data)
/************************************************************/
egg_test_title (test, "check we convert all the group bitfield");
for (i=1; i<PK_GROUP_ENUM_LAST; i++) {
- string = pk_group_enum_to_text (i);
+ string = pk_group_enum_to_string (i);
if (string == NULL) {
egg_test_failed (test, "failed to get %i", i);
break;
@@ -1226,7 +1226,7 @@ pk_enum_test (gpointer user_data)
/************************************************************/
egg_test_title (test, "check we convert all the info bitfield");
for (i=1; i<PK_INFO_ENUM_LAST; i++) {
- string = pk_info_enum_to_text (i);
+ string = pk_info_enum_to_string (i);
if (string == NULL) {
egg_test_failed (test, "failed to get %i", i);
break;
@@ -1237,7 +1237,7 @@ pk_enum_test (gpointer user_data)
/************************************************************/
egg_test_title (test, "check we convert all the sig_type bitfield");
for (i=0; i<PK_SIGTYPE_ENUM_LAST; i++) {
- string = pk_sig_type_enum_to_text (i);
+ string = pk_sig_type_enum_to_string (i);
if (string == NULL) {
egg_test_failed (test, "failed to get %i", i);
break;
@@ -1248,7 +1248,7 @@ pk_enum_test (gpointer user_data)
/************************************************************/
egg_test_title (test, "check we convert all the upgrade bitfield");
for (i=0; i<PK_DISTRO_UPGRADE_ENUM_LAST; i++) {
- string = pk_distro_upgrade_enum_to_text (i);
+ string = pk_distro_upgrade_enum_to_string (i);
if (string == NULL) {
egg_test_failed (test, "failed to get %i", i);
break;
@@ -1259,7 +1259,7 @@ pk_enum_test (gpointer user_data)
/************************************************************/
egg_test_title (test, "check we convert all the license bitfield");
for (i=0; i<PK_LICENSE_ENUM_LAST; i++) {
- string = pk_license_enum_to_text (i);
+ string = pk_license_enum_to_string (i);
if (string == NULL) {
egg_test_failed (test, "failed to get %i", i);
break;
@@ -1270,7 +1270,7 @@ pk_enum_test (gpointer user_data)
/************************************************************/
egg_test_title (test, "check we convert all the media type bitfield");
for (i=0; i<PK_MEDIA_TYPE_ENUM_LAST; i++) {
- string = pk_media_type_enum_to_text (i);
+ string = pk_media_type_enum_to_string (i);
if (string == NULL) {
egg_test_failed (test, "failed to get %i", i);
break;
diff --git a/lib/packagekit-glib2/pk-enum.h b/lib/packagekit-glib2/pk-enum.h
index 4688142..e8dcf4e 100644
--- a/lib/packagekit-glib2/pk-enum.h
+++ b/lib/packagekit-glib2/pk-enum.h
@@ -30,6 +30,42 @@
G_BEGIN_DECLS
+/* These are compatibility enums so we can break API in the future */
+#define pk_sig_type_enum_from_text pk_sig_type_enum_from_string
+#define pk_sig_type_enum_to_text pk_sig_type_enum_to_string
+#define pk_distro_upgrade_enum_from_text pk_distro_upgrade_enum_from_string
+#define pk_distro_upgrade_enum_to_text pk_distro_upgrade_enum_to_string
+#define pk_provides_enum_from_text pk_provides_enum_from_string
+#define pk_provides_enum_to_text pk_provides_enum_to_string
+#define pk_info_enum_from_text pk_info_enum_from_string
+#define pk_info_enum_to_text pk_info_enum_to_string
+#define pk_exit_enum_from_text pk_exit_enum_from_string
+#define pk_exit_enum_to_text pk_exit_enum_to_string
+#define pk_network_enum_from_text pk_network_enum_from_string
+#define pk_network_enum_to_text pk_network_enum_to_string
+#define pk_status_enum_from_text pk_status_enum_from_string
+#define pk_status_enum_to_text pk_status_enum_to_string
+#define pk_role_enum_from_text pk_role_enum_from_string
+#define pk_role_enum_to_text pk_role_enum_to_string
+#define pk_error_enum_from_text pk_error_enum_from_string
+#define pk_error_enum_to_text pk_error_enum_to_string
+#define pk_restart_enum_from_text pk_restart_enum_from_string
+#define pk_restart_enum_to_text pk_restart_enum_to_string
+#define pk_message_enum_from_text pk_message_enum_from_string
+#define pk_message_enum_to_text pk_message_enum_to_string
+#define pk_group_enum_from_text pk_group_enum_from_string
+#define pk_group_enum_to_text pk_group_enum_to_string
+#define pk_update_state_enum_from_text pk_update_state_enum_from_string
+#define pk_update_state_enum_to_text pk_update_state_enum_to_string
+#define pk_filter_enum_from_text pk_filter_enum_from_string
+#define pk_filter_enum_to_text pk_filter_enum_to_string
+#define pk_license_enum_from_text pk_license_enum_from_string
+#define pk_license_enum_to_text pk_license_enum_to_string
+#define pk_media_type_enum_from_text pk_media_type_enum_from_string
+#define pk_media_type_enum_to_text pk_media_type_enum_to_string
+#define pk_authorize_type_enum_from_text pk_authorize_type_enum_from_string
+#define pk_authorize_type_enum_to_text pk_authorize_type_enum_to_string
+
/**
* PkEnumMatch:
*
@@ -672,56 +708,56 @@ const gchar *pk_enum_find_string (const PkEnumMatch *table,
guint value)
G_GNUC_WARN_UNUSED_RESULT;
-PkSigTypeEnum pk_sig_type_enum_from_text (const gchar *sig_type);
-const gchar *pk_sig_type_enum_to_text (PkSigTypeEnum sig_type);
+PkSigTypeEnum pk_sig_type_enum_from_string (const gchar *sig_type);
+const gchar *pk_sig_type_enum_to_string (PkSigTypeEnum sig_type);
-PkInfoEnum pk_info_enum_from_text (const gchar *info);
-const gchar *pk_info_enum_to_text (PkInfoEnum info);
+PkInfoEnum pk_info_enum_from_string (const gchar *info);
+const gchar *pk_info_enum_to_string (PkInfoEnum info);
-PkUpdateStateEnum pk_update_state_enum_from_text (const gchar *update_state);
-const gchar *pk_update_state_enum_to_text (PkUpdateStateEnum update_state);
+PkUpdateStateEnum pk_update_state_enum_from_string (const gchar *update_state);
+const gchar *pk_update_state_enum_to_string (PkUpdateStateEnum update_state);
-PkExitEnum pk_exit_enum_from_text (const gchar *exit);
-const gchar *pk_exit_enum_to_text (PkExitEnum exit);
+PkExitEnum pk_exit_enum_from_string (const gchar *exit);
+const gchar *pk_exit_enum_to_string (PkExitEnum exit);
-PkNetworkEnum pk_network_enum_from_text (const gchar *network);
-const gchar *pk_network_enum_to_text (PkNetworkEnum network);
+PkNetworkEnum pk_network_enum_from_string (const gchar *network);
+const gchar *pk_network_enum_to_string (PkNetworkEnum network);
-PkStatusEnum pk_status_enum_from_text (const gchar *status);
-const gchar *pk_status_enum_to_text (PkStatusEnum status);
+PkStatusEnum pk_status_enum_from_string (const gchar *status);
+const gchar *pk_status_enum_to_string (PkStatusEnum status);
-PkRoleEnum pk_role_enum_from_text (const gchar *role);
-const gchar *pk_role_enum_to_text (PkRoleEnum role);
+PkRoleEnum pk_role_enum_from_string (const gchar *role);
+const gchar *pk_role_enum_to_string (PkRoleEnum role);
-PkErrorEnum pk_error_enum_from_text (const gchar *code);
-const gchar *pk_error_enum_to_text (PkErrorEnum code);
+PkErrorEnum pk_error_enum_from_string (const gchar *code);
+const gchar *pk_error_enum_to_string (PkErrorEnum code);
-PkRestartEnum pk_restart_enum_from_text (const gchar *restart);
-const gchar *pk_restart_enum_to_text (PkRestartEnum restart);
+PkRestartEnum pk_restart_enum_from_string (const gchar *restart);
+const gchar *pk_restart_enum_to_string (PkRestartEnum restart);
-PkMessageEnum pk_message_enum_from_text (const gchar *message);
-const gchar *pk_message_enum_to_text (PkMessageEnum message);
+PkMessageEnum pk_message_enum_from_string (const gchar *message);
+const gchar *pk_message_enum_to_string (PkMessageEnum message);
-PkGroupEnum pk_group_enum_from_text (const gchar *group);
-const gchar *pk_group_enum_to_text (PkGroupEnum group);
+PkGroupEnum pk_group_enum_from_string (const gchar *group);
+const gchar *pk_group_enum_to_string (PkGroupEnum group);
-PkFilterEnum pk_filter_enum_from_text (const gchar *filter);
-const gchar *pk_filter_enum_to_text (PkFilterEnum filter);
+PkFilterEnum pk_filter_enum_from_string (const gchar *filter);
+const gchar *pk_filter_enum_to_string (PkFilterEnum filter);
-PkProvidesEnum pk_provides_enum_from_text (const gchar *provides);
-const gchar *pk_provides_enum_to_text (PkProvidesEnum provides);
+PkProvidesEnum pk_provides_enum_from_string (const gchar *provides);
+const gchar *pk_provides_enum_to_string (PkProvidesEnum provides);
-PkLicenseEnum pk_license_enum_from_text (const gchar *license);
-const gchar *pk_license_enum_to_text (PkLicenseEnum license);
+PkLicenseEnum pk_license_enum_from_string (const gchar *license);
+const gchar *pk_license_enum_to_string (PkLicenseEnum license);
-PkDistroUpgradeEnum pk_distro_upgrade_enum_from_text (const gchar *upgrade);
-const gchar *pk_distro_upgrade_enum_to_text (PkDistroUpgradeEnum upgrade);
+PkDistroUpgradeEnum pk_distro_upgrade_enum_from_string (const gchar *upgrade);
+const gchar *pk_distro_upgrade_enum_to_string (PkDistroUpgradeEnum upgrade);
-PkMediaTypeEnum pk_media_type_enum_from_text (const gchar *media_type);
-const gchar *pk_media_type_enum_to_text (PkMediaTypeEnum media_type);
+PkMediaTypeEnum pk_media_type_enum_from_string (const gchar *media_type);
+const gchar *pk_media_type_enum_to_string (PkMediaTypeEnum media_type);
-PkAuthorizeEnum pk_authorize_type_enum_from_text (const gchar *auth_type);
-const gchar *pk_authorize_type_enum_to_text (PkAuthorizeEnum auth_type);
+PkAuthorizeEnum pk_authorize_type_enum_from_string (const gchar *auth_type);
+const gchar *pk_authorize_type_enum_to_string (PkAuthorizeEnum auth_type);
G_END_DECLS
diff --git a/lib/packagekit-glib2/pk-package-ids.c b/lib/packagekit-glib2/pk-package-ids.c
index 933b623..0ff522e 100644
--- a/lib/packagekit-glib2/pk-package-ids.c
+++ b/lib/packagekit-glib2/pk-package-ids.c
@@ -51,7 +51,7 @@ pk_package_ids_from_id (const gchar *package_id)
}
/**
- * pk_package_ids_from_text:
+ * pk_package_ids_from_string:
* @package_id: A single package_id
*
* Form a composite string array of package_id's from
@@ -60,7 +60,7 @@ pk_package_ids_from_id (const gchar *package_id)
* Return value: the string array, or %NULL if invalid, free with g_strfreev()
**/
gchar **
-pk_package_ids_from_text (const gchar *package_id)
+pk_package_ids_from_string (const gchar *package_id)
{
g_return_val_if_fail (package_id != NULL, NULL);
return g_strsplit (package_id, PK_PACKAGE_IDS_DELIM, 0);
@@ -97,7 +97,7 @@ out:
}
/**
- * pk_package_ids_to_text:
+ * pk_package_ids_to_string:
* @package_ids: a string array of package_id's
*
* Cats the string array of package_id's into one delimited string
@@ -105,7 +105,7 @@ out:
* Return value: a string representation of all the package_id's.
**/
gchar *
-pk_package_ids_to_text (gchar **package_ids)
+pk_package_ids_to_string (gchar **package_ids)
{
/* special case as this is allowed */
if (package_ids == NULL)
@@ -252,7 +252,7 @@ pk_package_ids_test (gpointer user_data)
************************************************************/
egg_test_title (test, "parse va_list");
- package_ids = pk_package_ids_from_text ("foo;0.0.1;i386;fedora&bar;0.1.1;noarch;livna");
+ package_ids = pk_package_ids_from_string ("foo;0.0.1;i386;fedora&bar;0.1.1;noarch;livna");
egg_test_assert (test, package_ids != NULL);
/************************************************************/
diff --git a/lib/packagekit-glib2/pk-package-ids.h b/lib/packagekit-glib2/pk-package-ids.h
index 6e77aa9..b6fd3aa 100644
--- a/lib/packagekit-glib2/pk-package-ids.h
+++ b/lib/packagekit-glib2/pk-package-ids.h
@@ -45,9 +45,9 @@ G_BEGIN_DECLS
void pk_package_ids_test (gpointer user_data);
gchar **pk_package_ids_from_id (const gchar *package_id);
-gchar **pk_package_ids_from_text (const gchar *package_id);
+gchar **pk_package_ids_from_string (const gchar *package_id);
gboolean pk_package_ids_check (gchar **package_ids);
-gchar *pk_package_ids_to_text (gchar **package_ids);
+gchar *pk_package_ids_to_string (gchar **package_ids);
gboolean pk_package_ids_present_id (gchar **package_ids,
const gchar *package_id);
gchar **pk_package_ids_add_id (gchar **package_ids,
diff --git a/lib/packagekit-glib2/pk-progress.c b/lib/packagekit-glib2/pk-progress.c
index 5951dbe..14b4bb6 100644
--- a/lib/packagekit-glib2/pk-progress.c
+++ b/lib/packagekit-glib2/pk-progress.c
@@ -239,7 +239,7 @@ pk_progress_set_status (PkProgress *progress, PkStatusEnum status)
/* new value */
progress->priv->status = status;
- egg_debug ("status now %s", pk_status_enum_to_text (status));
+ egg_debug ("status now %s", pk_status_enum_to_string (status));
g_object_notify (G_OBJECT(progress), "status");
return TRUE;
@@ -259,7 +259,7 @@ pk_progress_set_role (PkProgress *progress, PkRoleEnum role)
/* new value */
progress->priv->role = role;
- egg_debug ("role now %s", pk_role_enum_to_text (role));
+ egg_debug ("role now %s", pk_role_enum_to_string (role));
g_object_notify (G_OBJECT(progress), "role");
return TRUE;
diff --git a/lib/packagekit-glib2/pk-results.c b/lib/packagekit-glib2/pk-results.c
index 4c9a5ef..bb7205b 100644
--- a/lib/packagekit-glib2/pk-results.c
+++ b/lib/packagekit-glib2/pk-results.c
@@ -489,7 +489,7 @@ pk_results_get_error_code (PkResults *results)
/* failed, but no exit code? */
if (results->priv->error_code == NULL && results->priv->exit_enum != PK_EXIT_ENUM_SUCCESS)
- egg_warning ("internal error: failed, but no exit code: %s", pk_exit_enum_to_text (results->priv->exit_enum));
+ egg_warning ("internal error: failed, but no exit code: %s", pk_exit_enum_to_string (results->priv->exit_enum));
if (results->priv->error_code == NULL)
return NULL;
diff --git a/lib/packagekit-glib2/pk-service-pack.c b/lib/packagekit-glib2/pk-service-pack.c
index 989bd62..49f7663 100644
--- a/lib/packagekit-glib2/pk-service-pack.c
+++ b/lib/packagekit-glib2/pk-service-pack.c
@@ -1117,7 +1117,7 @@ pk_service_pack_test_progress_cb (PkProgress *progress, PkProgressType type, Egg
g_object_get (progress,
"status", &status,
NULL);
- egg_debug ("now %s", pk_status_enum_to_text (status));
+ egg_debug ("now %s", pk_status_enum_to_string (status));
}
}
diff --git a/lib/packagekit-glib2/pk-task-text.c b/lib/packagekit-glib2/pk-task-text.c
index 63a3ac5..ad76e99 100644
--- a/lib/packagekit-glib2/pk-task-text.c
+++ b/lib/packagekit-glib2/pk-task-text.c
@@ -267,7 +267,7 @@ pk_task_text_media_change_question (PkTask *task, guint request, PkResults *resu
g_print ("%s\n", _("Media change required"));
/* TRANSLATORS: the type, e.g. DVD, CD, etc */
- g_print (" %s: %s\n", _("Media type"), pk_media_type_enum_to_text (media_type));
+ g_print (" %s: %s\n", _("Media type"), pk_media_type_enum_to_string (media_type));
/* TRANSLATORS: the media label, usually like 'disk-1of3' */
g_print (" %s: %s\n", _("Media label"), media_id);
@@ -292,10 +292,10 @@ pk_task_text_media_change_question (PkTask *task, guint request, PkResults *resu
}
/**
- * pk_task_text_simulate_question_type_to_text:
+ * pk_task_text_simulate_question_type_to_string:
**/
static const gchar *
-pk_task_text_simulate_question_type_to_text (PkInfoEnum info)
+pk_task_text_simulate_question_type_to_string (PkInfoEnum info)
{
if (info == PK_INFO_ENUM_REMOVING) {
/* TRANSLATORS: When processing, we might have to remove other dependencies */
@@ -363,9 +363,9 @@ pk_task_text_simulate_question (PkTask *task, guint request, PkResults *results)
NULL);
/* new header */
if (info != info_last) {
- title = pk_task_text_simulate_question_type_to_text (info);
+ title = pk_task_text_simulate_question_type_to_string (info);
if (title == NULL) {
- title = pk_info_enum_to_text (info);
+ title = pk_info_enum_to_string (info);
egg_warning ("cannot translate '%s', please report!", title);
}
g_print ("%s\n", title);
@@ -473,7 +473,7 @@ pk_task_text_test_install_packages_cb (GObject *object, GAsyncResult *res, EggTe
exit_enum = pk_results_get_exit_code (results);
if (exit_enum != PK_EXIT_ENUM_SUCCESS)
- egg_test_failed (test, "failed to resolve success: %s", pk_exit_enum_to_text (exit_enum));
+ egg_test_failed (test, "failed to resolve success: %s", pk_exit_enum_to_string (exit_enum));
packages = pk_results_get_package_array (results);
if (packages == NULL)
@@ -484,7 +484,7 @@ pk_task_text_test_install_packages_cb (GObject *object, GAsyncResult *res, EggTe
g_ptr_array_unref (packages);
- egg_debug ("results exit enum = %s", pk_exit_enum_to_text (exit_enum));
+ egg_debug ("results exit enum = %s", pk_exit_enum_to_string (exit_enum));
out:
if (results != NULL)
g_object_unref (results);
@@ -499,7 +499,7 @@ pk_task_text_test_progress_cb (PkProgress *progress, PkProgressType type, EggTes
g_object_get (progress,
"status", &status,
NULL);
- egg_debug ("now %s", pk_status_enum_to_text (status));
+ egg_debug ("now %s", pk_status_enum_to_string (status));
}
}
diff --git a/lib/packagekit-glib2/pk-task-wrapper.c b/lib/packagekit-glib2/pk-task-wrapper.c
index f692dbd..5f21c0b 100644
--- a/lib/packagekit-glib2/pk-task-wrapper.c
+++ b/lib/packagekit-glib2/pk-task-wrapper.c
@@ -139,7 +139,7 @@ pk_task_wrapper_simulate_question (PkTask *task, guint request, PkResults *resul
NULL);
package_id = pk_package_get_id (package);
printable = pk_package_id_to_printable (package_id);
- g_print ("%s\t%s\t%s\n", pk_info_enum_to_text (info), printable, summary);
+ g_print ("%s\t%s\t%s\n", pk_info_enum_to_string (info), printable, summary);
g_free (summary);
g_free (printable);
@@ -233,7 +233,7 @@ pk_task_wrapper_test_install_packages_cb (GObject *object, GAsyncResult *res, Eg
exit_enum = pk_results_get_exit_code (results);
if (exit_enum != PK_EXIT_ENUM_SUCCESS)
- egg_test_failed (test, "failed to install packages: %s", pk_exit_enum_to_text (exit_enum));
+ egg_test_failed (test, "failed to install packages: %s", pk_exit_enum_to_string (exit_enum));
packages = pk_results_get_package_array (results);
if (packages == NULL)
@@ -244,7 +244,7 @@ pk_task_wrapper_test_install_packages_cb (GObject *object, GAsyncResult *res, Eg
g_ptr_array_unref (packages);
- egg_debug ("results exit enum = %s", pk_exit_enum_to_text (exit_enum));
+ egg_debug ("results exit enum = %s", pk_exit_enum_to_string (exit_enum));
out:
if (results != NULL)
g_object_unref (results);
@@ -259,7 +259,7 @@ pk_task_wrapper_test_progress_cb (PkProgress *progress, PkProgressType type, Egg
g_object_get (progress,
"status", &status,
NULL);
- egg_debug ("now %s", pk_status_enum_to_text (status));
+ egg_debug ("now %s", pk_status_enum_to_string (status));
}
}
diff --git a/lib/packagekit-glib2/pk-task.c b/lib/packagekit-glib2/pk-task.c
index 44f80c3..90c6a81 100644
--- a/lib/packagekit-glib2/pk-task.c
+++ b/lib/packagekit-glib2/pk-task.c
@@ -1173,7 +1173,7 @@ pk_task_test_progress_cb (PkProgress *progress, PkProgressType type, EggTest *te
g_object_get (progress,
"status", &status,
NULL);
- egg_debug ("now %s", pk_status_enum_to_text (status));
+ egg_debug ("now %s", pk_status_enum_to_string (status));
}
}
diff --git a/lib/packagekit-glib2/pk-transaction-list.c b/lib/packagekit-glib2/pk-transaction-list.c
index d9000a5..33358d5 100644
--- a/lib/packagekit-glib2/pk-transaction-list.c
+++ b/lib/packagekit-glib2/pk-transaction-list.c
@@ -330,7 +330,7 @@ pk_transaction_list_test_resolve_cb (GObject *object, GAsyncResult *res, EggTest
exit_enum = pk_results_get_exit_code (results);
if (exit_enum != PK_EXIT_ENUM_SUCCESS)
- egg_test_failed (test, "failed to resolve success: %s", pk_exit_enum_to_text (exit_enum));
+ egg_test_failed (test, "failed to resolve success: %s", pk_exit_enum_to_string (exit_enum));
out:
if (results != NULL)
g_object_unref (results);
@@ -386,7 +386,7 @@ pk_transaction_list_test (gpointer user_data)
/************************************************************/
egg_test_title (test, "resolve package");
- package_ids = pk_package_ids_from_text ("glib2;2.14.0;i386;fedora&powertop");
+ package_ids = pk_package_ids_from_string ("glib2;2.14.0;i386;fedora&powertop");
_refcount = 2;
pk_client_resolve_async (client, pk_bitfield_value (PK_FILTER_ENUM_INSTALLED), package_ids, NULL, NULL, NULL,
(GAsyncReadyCallback) pk_transaction_list_test_resolve_cb, test);
diff --git a/lib/packagekit-sharp/packagekit-api.raw b/lib/packagekit-sharp/packagekit-api.raw
index 49977b3..9aeb01b 100644
--- a/lib/packagekit-sharp/packagekit-api.raw
+++ b/lib/packagekit-sharp/packagekit-api.raw
@@ -1784,13 +1784,13 @@
</method>
</class>
<class name="Distro" cname="PkDistro_">
- <method name="UpgradeEnumFromText" cname="pk_distro_upgrade_enum_from_text" shared="true">
+ <method name="UpgradeEnumFromText" cname="pk_distro_upgrade_enum_from_string" shared="true">
<return-type type="PkDistroUpgradeEnum" />
<parameters>
<parameter type="const-gchar*" name="upgrade" />
</parameters>
</method>
- <method name="UpgradeEnumToText" cname="pk_distro_upgrade_enum_to_text" shared="true">
+ <method name="UpgradeEnumToText" cname="pk_distro_upgrade_enum_to_string" shared="true">
<return-type type="const-gchar*" />
<parameters>
<parameter type="PkDistroUpgradeEnum" name="upgrade" />
@@ -1814,13 +1814,13 @@
</method>
</class>
<class name="Error" cname="PkError_">
- <method name="EnumFromText" cname="pk_error_enum_from_text" shared="true">
+ <method name="EnumFromText" cname="pk_error_enum_from_string" shared="true">
<return-type type="PkErrorCodeEnum" />
<parameters>
<parameter type="const-gchar*" name="code" />
</parameters>
</method>
- <method name="EnumToText" cname="pk_error_enum_to_text" shared="true">
+ <method name="EnumToText" cname="pk_error_enum_to_string" shared="true">
<return-type type="const-gchar*" />
<parameters>
<parameter type="PkErrorCodeEnum" name="code" />
@@ -1828,13 +1828,13 @@
</method>
</class>
<class name="Exit" cname="PkExit_">
- <method name="EnumFromText" cname="pk_exit_enum_from_text" shared="true">
+ <method name="EnumFromText" cname="pk_exit_enum_from_string" shared="true">
<return-type type="PkExitEnum" />
<parameters>
<parameter type="const-gchar*" name="exit" />
</parameters>
</method>
- <method name="EnumToText" cname="pk_exit_enum_to_text" shared="true">
+ <method name="EnumToText" cname="pk_exit_enum_to_string" shared="true">
<return-type type="const-gchar*" />
<parameters>
<parameter type="PkExitEnum" name="exit" />
@@ -1842,25 +1842,25 @@
</method>
</class>
<class name="Filter" cname="PkFilter_">
- <method name="BitfieldFromText" cname="pk_filter_bitfield_from_text" shared="true">
+ <method name="BitfieldFromText" cname="pk_filter_bitfield_from_string" shared="true">
<return-type type="PkBitfield" />
<parameters>
<parameter type="const-gchar*" name="filters" />
</parameters>
</method>
- <method name="BitfieldToText" cname="pk_filter_bitfield_to_text" shared="true">
+ <method name="BitfieldToText" cname="pk_filter_bitfield_to_string" shared="true">
<return-type type="gchar*" />
<parameters>
<parameter type="PkBitfield" name="filters" />
</parameters>
</method>
- <method name="EnumFromText" cname="pk_filter_enum_from_text" shared="true">
+ <method name="EnumFromText" cname="pk_filter_enum_from_string" shared="true">
<return-type type="PkFilterEnum" />
<parameters>
<parameter type="const-gchar*" name="filter" />
</parameters>
</method>
- <method name="EnumToText" cname="pk_filter_enum_to_text" shared="true">
+ <method name="EnumToText" cname="pk_filter_enum_to_string" shared="true">
<return-type type="const-gchar*" />
<parameters>
<parameter type="PkFilterEnum" name="filter" />
@@ -1892,25 +1892,25 @@
</method>
</class>
<class name="Group" cname="PkGroup_">
- <method name="BitfieldFromText" cname="pk_group_bitfield_from_text" shared="true">
+ <method name="BitfieldFromText" cname="pk_group_bitfield_from_string" shared="true">
<return-type type="PkBitfield" />
<parameters>
<parameter type="const-gchar*" name="groups" />
</parameters>
</method>
- <method name="BitfieldToText" cname="pk_group_bitfield_to_text" shared="true">
+ <method name="BitfieldToText" cname="pk_group_bitfield_to_string" shared="true">
<return-type type="gchar*" />
<parameters>
<parameter type="PkBitfield" name="groups" />
</parameters>
</method>
- <method name="EnumFromText" cname="pk_group_enum_from_text" shared="true">
+ <method name="EnumFromText" cname="pk_group_enum_from_string" shared="true">
<return-type type="PkGroupEnum" />
<parameters>
<parameter type="const-gchar*" name="group" />
</parameters>
</method>
- <method name="EnumToText" cname="pk_group_enum_to_text" shared="true">
+ <method name="EnumToText" cname="pk_group_enum_to_string" shared="true">
<return-type type="const-gchar*" />
<parameters>
<parameter type="PkGroupEnum" name="group" />
@@ -1918,13 +1918,13 @@
</method>
</class>
<class name="Info" cname="PkInfo_">
- <method name="EnumFromText" cname="pk_info_enum_from_text" shared="true">
+ <method name="EnumFromText" cname="pk_info_enum_from_string" shared="true">
<return-type type="PkInfoEnum" />
<parameters>
<parameter type="const-gchar*" name="info" />
</parameters>
</method>
- <method name="EnumToText" cname="pk_info_enum_to_text" shared="true">
+ <method name="EnumToText" cname="pk_info_enum_to_string" shared="true">
<return-type type="const-gchar*" />
<parameters>
<parameter type="PkInfoEnum" name="info" />
@@ -1932,13 +1932,13 @@
</method>
</class>
<class name="License" cname="PkLicense_">
- <method name="EnumFromText" cname="pk_license_enum_from_text" shared="true">
+ <method name="EnumFromText" cname="pk_license_enum_from_string" shared="true">
<return-type type="PkLicenseEnum" />
<parameters>
<parameter type="const-gchar*" name="license" />
</parameters>
</method>
- <method name="EnumToText" cname="pk_license_enum_to_text" shared="true">
+ <method name="EnumToText" cname="pk_license_enum_to_string" shared="true">
<return-type type="const-gchar*" />
<parameters>
<parameter type="PkLicenseEnum" name="license" />
@@ -1946,13 +1946,13 @@
</method>
</class>
<class name="Message" cname="PkMessage_">
- <method name="EnumFromText" cname="pk_message_enum_from_text" shared="true">
+ <method name="EnumFromText" cname="pk_message_enum_from_string" shared="true">
<return-type type="PkMessageEnum" />
<parameters>
<parameter type="const-gchar*" name="message" />
</parameters>
</method>
- <method name="EnumToText" cname="pk_message_enum_to_text" shared="true">
+ <method name="EnumToText" cname="pk_message_enum_to_string" shared="true">
<return-type type="const-gchar*" />
<parameters>
<parameter type="PkMessageEnum" name="message" />
@@ -1960,13 +1960,13 @@
</method>
</class>
<class name="Network" cname="PkNetwork_">
- <method name="EnumFromText" cname="pk_network_enum_from_text" shared="true">
+ <method name="EnumFromText" cname="pk_network_enum_from_string" shared="true">
<return-type type="PkNetworkEnum" />
<parameters>
<parameter type="const-gchar*" name="network" />
</parameters>
</method>
- <method name="EnumToText" cname="pk_network_enum_to_text" shared="true">
+ <method name="EnumToText" cname="pk_network_enum_to_string" shared="true">
<return-type type="const-gchar*" />
<parameters>
<parameter type="PkNetworkEnum" name="network" />
@@ -1992,7 +1992,7 @@
<parameter type="const-gchar*" name="package_id" />
</parameters>
</method>
- <method name="IdsFromText" cname="pk_package_ids_from_text" shared="true">
+ <method name="IdsFromText" cname="pk_package_ids_from_string" shared="true">
<return-type type="gchar**" />
<parameters>
<parameter type="const-gchar*" name="package_id" />
@@ -2017,7 +2017,7 @@
<parameter type="gchar**" name="package_ids" />
</parameters>
</method>
- <method name="IdsToText" cname="pk_package_ids_to_text" shared="true">
+ <method name="IdsToText" cname="pk_package_ids_to_string" shared="true">
<return-type type="gchar*" />
<parameters>
<parameter type="gchar**" name="package_ids" />
@@ -2025,13 +2025,13 @@
</method>
</class>
<class name="Provides" cname="PkProvides_">
- <method name="EnumFromText" cname="pk_provides_enum_from_text" shared="true">
+ <method name="EnumFromText" cname="pk_provides_enum_from_string" shared="true">
<return-type type="PkProvidesEnum" />
<parameters>
<parameter type="const-gchar*" name="provides" />
</parameters>
</method>
- <method name="EnumToText" cname="pk_provides_enum_to_text" shared="true">
+ <method name="EnumToText" cname="pk_provides_enum_to_string" shared="true">
<return-type type="const-gchar*" />
<parameters>
<parameter type="PkProvidesEnum" name="provides" />
@@ -2039,13 +2039,13 @@
</method>
</class>
<class name="Restart" cname="PkRestart_">
- <method name="EnumFromText" cname="pk_restart_enum_from_text" shared="true">
+ <method name="EnumFromText" cname="pk_restart_enum_from_string" shared="true">
<return-type type="PkRestartEnum" />
<parameters>
<parameter type="const-gchar*" name="restart" />
</parameters>
</method>
- <method name="EnumToText" cname="pk_restart_enum_to_text" shared="true">
+ <method name="EnumToText" cname="pk_restart_enum_to_string" shared="true">
<return-type type="const-gchar*" />
<parameters>
<parameter type="PkRestartEnum" name="restart" />
@@ -2053,25 +2053,25 @@
</method>
</class>
<class name="Role" cname="PkRole_">
- <method name="BitfieldFromText" cname="pk_role_bitfield_from_text" shared="true">
+ <method name="BitfieldFromText" cname="pk_role_bitfield_from_string" shared="true">
<return-type type="PkBitfield" />
<parameters>
<parameter type="const-gchar*" name="roles" />
</parameters>
</method>
- <method name="BitfieldToText" cname="pk_role_bitfield_to_text" shared="true">
+ <method name="BitfieldToText" cname="pk_role_bitfield_to_string" shared="true">
<return-type type="gchar*" />
<parameters>
<parameter type="PkBitfield" name="roles" />
</parameters>
</method>
- <method name="EnumFromText" cname="pk_role_enum_from_text" shared="true">
+ <method name="EnumFromText" cname="pk_role_enum_from_string" shared="true">
<return-type type="PkRoleEnum" />
<parameters>
<parameter type="const-gchar*" name="role" />
</parameters>
</method>
- <method name="EnumToText" cname="pk_role_enum_to_text" shared="true">
+ <method name="EnumToText" cname="pk_role_enum_to_string" shared="true">
<return-type type="const-gchar*" />
<parameters>
<parameter type="PkRoleEnum" name="role" />
@@ -2079,13 +2079,13 @@
</method>
</class>
<class name="Sig" cname="PkSig_">
- <method name="TypeEnumFromText" cname="pk_sig_type_enum_from_text" shared="true">
+ <method name="TypeEnumFromText" cname="pk_sig_type_enum_from_string" shared="true">
<return-type type="PkSigTypeEnum" />
<parameters>
<parameter type="const-gchar*" name="sig_type" />
</parameters>
</method>
- <method name="TypeEnumToText" cname="pk_sig_type_enum_to_text" shared="true">
+ <method name="TypeEnumToText" cname="pk_sig_type_enum_to_string" shared="true">
<return-type type="const-gchar*" />
<parameters>
<parameter type="PkSigTypeEnum" name="sig_type" />
@@ -2093,13 +2093,13 @@
</method>
</class>
<class name="Status" cname="PkStatus_">
- <method name="EnumFromText" cname="pk_status_enum_from_text" shared="true">
+ <method name="EnumFromText" cname="pk_status_enum_from_string" shared="true">
<return-type type="PkStatusEnum" />
<parameters>
<parameter type="const-gchar*" name="status" />
</parameters>
</method>
- <method name="EnumToText" cname="pk_status_enum_to_text" shared="true">
+ <method name="EnumToText" cname="pk_status_enum_to_string" shared="true">
<return-type type="const-gchar*" />
<parameters>
<parameter type="PkStatusEnum" name="status" />
@@ -2107,13 +2107,13 @@
</method>
</class>
<class name="Update" cname="PkUpdate_">
- <method name="StateEnumFromText" cname="pk_update_state_enum_from_text" shared="true">
+ <method name="StateEnumFromText" cname="pk_update_state_enum_from_string" shared="true">
<return-type type="PkUpdateStateEnum" />
<parameters>
<parameter type="const-gchar*" name="update_state" />
</parameters>
</method>
- <method name="StateEnumToText" cname="pk_update_state_enum_to_text" shared="true">
+ <method name="StateEnumToText" cname="pk_update_state_enum_to_string" shared="true">
<return-type type="const-gchar*" />
<parameters>
<parameter type="PkUpdateStateEnum" name="update_state" />
diff --git a/lib/packagekit-sharp/packagekit-api.xml b/lib/packagekit-sharp/packagekit-api.xml
index 1919159..40131a8 100644
--- a/lib/packagekit-sharp/packagekit-api.xml
+++ b/lib/packagekit-sharp/packagekit-api.xml
@@ -1792,13 +1792,13 @@
</method>
</class>
<class name="Distro" cname="PkDistro_">
- <method name="UpgradeEnumFromText" cname="pk_distro_upgrade_enum_from_text" shared="true">
+ <method name="UpgradeEnumFromText" cname="pk_distro_upgrade_enum_from_string" shared="true">
<return-type type="PkDistroUpgradeEnum" />
<parameters>
<parameter type="const-gchar*" name="upgrade" />
</parameters>
</method>
- <method name="UpgradeEnumToText" cname="pk_distro_upgrade_enum_to_text" shared="true">
+ <method name="UpgradeEnumToText" cname="pk_distro_upgrade_enum_to_string" shared="true">
<return-type type="const-gchar*" />
<parameters>
<parameter type="PkDistroUpgradeEnum" name="upgrade" />
@@ -1822,13 +1822,13 @@
</method>
</class>
<class name="Error" cname="PkError_">
- <method name="EnumFromText" cname="pk_error_enum_from_text" shared="true">
+ <method name="EnumFromText" cname="pk_error_enum_from_string" shared="true">
<return-type type="PkErrorCodeEnum" />
<parameters>
<parameter type="const-gchar*" name="code" />
</parameters>
</method>
- <method name="EnumToText" cname="pk_error_enum_to_text" shared="true">
+ <method name="EnumToText" cname="pk_error_enum_to_string" shared="true">
<return-type type="const-gchar*" />
<parameters>
<parameter type="PkErrorCodeEnum" name="code" />
@@ -1836,13 +1836,13 @@
</method>
</class>
<class name="Exit" cname="PkExit_">
- <method name="EnumFromText" cname="pk_exit_enum_from_text" shared="true">
+ <method name="EnumFromText" cname="pk_exit_enum_from_string" shared="true">
<return-type type="PkExitEnum" />
<parameters>
<parameter type="const-gchar*" name="exit" />
</parameters>
</method>
- <method name="EnumToText" cname="pk_exit_enum_to_text" shared="true">
+ <method name="EnumToText" cname="pk_exit_enum_to_string" shared="true">
<return-type type="const-gchar*" />
<parameters>
<parameter type="PkExitEnum" name="exit" />
@@ -1850,25 +1850,25 @@
</method>
</class>
<class name="Filter" cname="PkFilter_">
- <method name="BitfieldFromText" cname="pk_filter_bitfield_from_text" shared="true">
+ <method name="BitfieldFromText" cname="pk_filter_bitfield_from_string" shared="true">
<return-type type="PkBitfield" />
<parameters>
<parameter type="const-gchar*" name="filters" />
</parameters>
</method>
- <method name="BitfieldToText" cname="pk_filter_bitfield_to_text" shared="true">
+ <method name="BitfieldToText" cname="pk_filter_bitfield_to_string" shared="true">
<return-type type="gchar*" />
<parameters>
<parameter type="PkBitfield" name="filters" />
</parameters>
</method>
- <method name="EnumFromText" cname="pk_filter_enum_from_text" shared="true">
+ <method name="EnumFromText" cname="pk_filter_enum_from_string" shared="true">
<return-type type="PkFilterEnum" />
<parameters>
<parameter type="const-gchar*" name="filter" />
</parameters>
</method>
- <method name="EnumToText" cname="pk_filter_enum_to_text" shared="true">
+ <method name="EnumToText" cname="pk_filter_enum_to_string" shared="true">
<return-type type="const-gchar*" />
<parameters>
<parameter type="PkFilterEnum" name="filter" />
@@ -1900,25 +1900,25 @@
</method>
</class>
<class name="Group" cname="PkGroup_">
- <method name="BitfieldFromText" cname="pk_group_bitfield_from_text" shared="true">
+ <method name="BitfieldFromText" cname="pk_group_bitfield_from_string" shared="true">
<return-type type="PkBitfield" />
<parameters>
<parameter type="const-gchar*" name="groups" />
</parameters>
</method>
- <method name="BitfieldToText" cname="pk_group_bitfield_to_text" shared="true">
+ <method name="BitfieldToText" cname="pk_group_bitfield_to_string" shared="true">
<return-type type="gchar*" />
<parameters>
<parameter type="PkBitfield" name="groups" />
</parameters>
</method>
- <method name="EnumFromText" cname="pk_group_enum_from_text" shared="true">
+ <method name="EnumFromText" cname="pk_group_enum_from_string" shared="true">
<return-type type="PkGroupEnum" />
<parameters>
<parameter type="const-gchar*" name="group" />
</parameters>
</method>
- <method name="EnumToText" cname="pk_group_enum_to_text" shared="true">
+ <method name="EnumToText" cname="pk_group_enum_to_string" shared="true">
<return-type type="const-gchar*" />
<parameters>
<parameter type="PkGroupEnum" name="group" />
@@ -1926,13 +1926,13 @@
</method>
</class>
<class name="Info" cname="PkInfo_">
- <method name="EnumFromText" cname="pk_info_enum_from_text" shared="true">
+ <method name="EnumFromText" cname="pk_info_enum_from_string" shared="true">
<return-type type="PkInfoEnum" />
<parameters>
<parameter type="const-gchar*" name="info" />
</parameters>
</method>
- <method name="EnumToText" cname="pk_info_enum_to_text" shared="true">
+ <method name="EnumToText" cname="pk_info_enum_to_string" shared="true">
<return-type type="const-gchar*" />
<parameters>
<parameter type="PkInfoEnum" name="info" />
@@ -1940,13 +1940,13 @@
</method>
</class>
<class name="License" cname="PkLicense_">
- <method name="EnumFromText" cname="pk_license_enum_from_text" shared="true">
+ <method name="EnumFromText" cname="pk_license_enum_from_string" shared="true">
<return-type type="PkLicenseEnum" />
<parameters>
<parameter type="const-gchar*" name="license" />
</parameters>
</method>
- <method name="EnumToText" cname="pk_license_enum_to_text" shared="true">
+ <method name="EnumToText" cname="pk_license_enum_to_string" shared="true">
<return-type type="const-gchar*" />
<parameters>
<parameter type="PkLicenseEnum" name="license" />
@@ -1954,13 +1954,13 @@
</method>
</class>
<class name="Message" cname="PkMessage_">
- <method name="EnumFromText" cname="pk_message_enum_from_text" shared="true">
+ <method name="EnumFromText" cname="pk_message_enum_from_string" shared="true">
<return-type type="PkMessageEnum" />
<parameters>
<parameter type="const-gchar*" name="message" />
</parameters>
</method>
- <method name="EnumToText" cname="pk_message_enum_to_text" shared="true">
+ <method name="EnumToText" cname="pk_message_enum_to_string" shared="true">
<return-type type="const-gchar*" />
<parameters>
<parameter type="PkMessageEnum" name="message" />
@@ -1968,13 +1968,13 @@
</method>
</class>
<class name="Network" cname="PkNetwork_">
- <method name="EnumFromText" cname="pk_network_enum_from_text" shared="true">
+ <method name="EnumFromText" cname="pk_network_enum_from_string" shared="true">
<return-type type="PkNetworkEnum" />
<parameters>
<parameter type="const-gchar*" name="network" />
</parameters>
</method>
- <method name="EnumToText" cname="pk_network_enum_to_text" shared="true">
+ <method name="EnumToText" cname="pk_network_enum_to_string" shared="true">
<return-type type="const-gchar*" />
<parameters>
<parameter type="PkNetworkEnum" name="network" />
@@ -2000,7 +2000,7 @@
<parameter type="const-gchar*" name="package_id" />
</parameters>
</method>
- <method name="IdsFromText" cname="pk_package_ids_from_text" shared="true">
+ <method name="IdsFromText" cname="pk_package_ids_from_string" shared="true">
<return-type type="gchar**" />
<parameters>
<parameter type="const-gchar*" name="package_id" />
@@ -2025,7 +2025,7 @@
<parameter type="gchar**" name="package_ids" />
</parameters>
</method>
- <method name="IdsToText" cname="pk_package_ids_to_text" shared="true">
+ <method name="IdsToText" cname="pk_package_ids_to_string" shared="true">
<return-type type="gchar*" />
<parameters>
<parameter type="gchar**" name="package_ids" />
@@ -2033,13 +2033,13 @@
</method>
</class>
<class name="Provides" cname="PkProvides_">
- <method name="EnumFromText" cname="pk_provides_enum_from_text" shared="true">
+ <method name="EnumFromText" cname="pk_provides_enum_from_string" shared="true">
<return-type type="PkProvidesEnum" />
<parameters>
<parameter type="const-gchar*" name="provides" />
</parameters>
</method>
- <method name="EnumToText" cname="pk_provides_enum_to_text" shared="true">
+ <method name="EnumToText" cname="pk_provides_enum_to_string" shared="true">
<return-type type="const-gchar*" />
<parameters>
<parameter type="PkProvidesEnum" name="provides" />
@@ -2047,13 +2047,13 @@
</method>
</class>
<class name="Restart" cname="PkRestart_">
- <method name="EnumFromText" cname="pk_restart_enum_from_text" shared="true">
+ <method name="EnumFromText" cname="pk_restart_enum_from_string" shared="true">
<return-type type="PkRestartEnum" />
<parameters>
<parameter type="const-gchar*" name="restart" />
</parameters>
</method>
- <method name="EnumToText" cname="pk_restart_enum_to_text" shared="true">
+ <method name="EnumToText" cname="pk_restart_enum_to_string" shared="true">
<return-type type="const-gchar*" />
<parameters>
<parameter type="PkRestartEnum" name="restart" />
@@ -2061,25 +2061,25 @@
</method>
</class>
<class name="Role" cname="PkRole_">
- <method name="BitfieldFromText" cname="pk_role_bitfield_from_text" shared="true">
+ <method name="BitfieldFromText" cname="pk_role_bitfield_from_string" shared="true">
<return-type type="PkBitfield" />
<parameters>
<parameter type="const-gchar*" name="roles" />
</parameters>
</method>
- <method name="BitfieldToText" cname="pk_role_bitfield_to_text" shared="true">
+ <method name="BitfieldToText" cname="pk_role_bitfield_to_string" shared="true">
<return-type type="gchar*" />
<parameters>
<parameter type="PkBitfield" name="roles" />
</parameters>
</method>
- <method name="EnumFromText" cname="pk_role_enum_from_text" shared="true">
+ <method name="EnumFromText" cname="pk_role_enum_from_string" shared="true">
<return-type type="PkRoleEnum" />
<parameters>
<parameter type="const-gchar*" name="role" />
</parameters>
</method>
- <method name="EnumToText" cname="pk_role_enum_to_text" shared="true">
+ <method name="EnumToText" cname="pk_role_enum_to_string" shared="true">
<return-type type="const-gchar*" />
<parameters>
<parameter type="PkRoleEnum" name="role" />
@@ -2087,13 +2087,13 @@
</method>
</class>
<class name="Sig" cname="PkSig_">
- <method name="TypeEnumFromText" cname="pk_sig_type_enum_from_text" shared="true">
+ <method name="TypeEnumFromText" cname="pk_sig_type_enum_from_string" shared="true">
<return-type type="PkSigTypeEnum" />
<parameters>
<parameter type="const-gchar*" name="sig_type" />
</parameters>
</method>
- <method name="TypeEnumToText" cname="pk_sig_type_enum_to_text" shared="true">
+ <method name="TypeEnumToText" cname="pk_sig_type_enum_to_string" shared="true">
<return-type type="const-gchar*" />
<parameters>
<parameter type="PkSigTypeEnum" name="sig_type" />
@@ -2101,13 +2101,13 @@
</method>
</class>
<class name="Status" cname="PkStatus_">
- <method name="EnumFromText" cname="pk_status_enum_from_text" shared="true">
+ <method name="EnumFromText" cname="pk_status_enum_from_string" shared="true">
<return-type type="PkStatusEnum" />
<parameters>
<parameter type="const-gchar*" name="status" />
</parameters>
</method>
- <method name="EnumToText" cname="pk_status_enum_to_text" shared="true">
+ <method name="EnumToText" cname="pk_status_enum_to_string" shared="true">
<return-type type="const-gchar*" />
<parameters>
<parameter type="PkStatusEnum" name="status" />
@@ -2115,13 +2115,13 @@
</method>
</class>
<class name="Update" cname="PkUpdate_">
- <method name="StateEnumFromText" cname="pk_update_state_enum_from_text" shared="true">
+ <method name="StateEnumFromText" cname="pk_update_state_enum_from_string" shared="true">
<return-type type="PkUpdateStateEnum" />
<parameters>
<parameter type="const-gchar*" name="update_state" />
</parameters>
</method>
- <method name="StateEnumToText" cname="pk_update_state_enum_to_text" shared="true">
+ <method name="StateEnumToText" cname="pk_update_state_enum_to_string" shared="true">
<return-type type="const-gchar*" />
<parameters>
<parameter type="PkUpdateStateEnum" name="update_state" />
diff --git a/lib/python/packagekit/backend.py b/lib/python/packagekit/backend.py
index 1053bf0..123a778 100644
--- a/lib/python/packagekit/backend.py
+++ b/lib/python/packagekit/backend.py
@@ -191,7 +191,7 @@ class PackageKitBaseBackend:
@param repoid: The repo id tag
@param state: false is repo is disabled else true.
'''
- print >> sys.stdout, "repo-detail\t%s\t%s\t%s" % (repoid, name, _bool_to_text(state))
+ print >> sys.stdout, "repo-detail\t%s\t%s\t%s" % (repoid, name, _bool_to_string(state))
sys.stdout.flush()
def data(self, data):
@@ -737,7 +737,7 @@ def _text_to_bool(text):
return True
return False
-def _bool_to_text(value):
+def _bool_to_string(value):
if value:
return "true"
return "false"
diff --git a/src/pk-backend-spawn.c b/src/pk-backend-spawn.c
index 900854b..ebbfbdb 100644
--- a/src/pk-backend-spawn.c
+++ b/src/pk-backend-spawn.c
@@ -147,7 +147,7 @@ pk_backend_spawn_parse_stdout (PkBackendSpawn *backend_spawn, const gchar *line)
ret = FALSE;
goto out;
}
- info = pk_info_enum_from_text (sections[1]);
+ info = pk_info_enum_from_string (sections[1]);
if (info == PK_INFO_ENUM_UNKNOWN) {
pk_backend_message (backend_spawn->priv->backend, PK_MESSAGE_ENUM_BACKEND_ERROR,
"Info enum not recognised, and hence ignored: '%s'", sections[1]);
@@ -161,7 +161,7 @@ pk_backend_spawn_parse_stdout (PkBackendSpawn *backend_spawn, const gchar *line)
ret = FALSE;
goto out;
}
- group = pk_group_enum_from_text (sections[3]);
+ group = pk_group_enum_from_string (sections[3]);
/* ITS4: ignore, checked for overflow */
package_size = atol (sections[6]);
@@ -211,14 +211,14 @@ pk_backend_spawn_parse_stdout (PkBackendSpawn *backend_spawn, const gchar *line)
ret = FALSE;
goto out;
}
- restart = pk_restart_enum_from_text (sections[7]);
+ restart = pk_restart_enum_from_string (sections[7]);
if (restart == PK_RESTART_ENUM_UNKNOWN) {
pk_backend_message (backend_spawn->priv->backend, PK_MESSAGE_ENUM_BACKEND_ERROR,
"Restart enum not recognised, and hence ignored: '%s'", sections[7]);
ret = FALSE;
goto out;
}
- update_state_enum = pk_update_state_enum_from_text (sections[10]);
+ update_state_enum = pk_update_state_enum_from_string (sections[10]);
/* convert ; to \n as we can't emit them on stdout */
g_strdelimit (sections[8], ";", '\n');
g_strdelimit (sections[9], ";", '\n');
@@ -263,7 +263,7 @@ pk_backend_spawn_parse_stdout (PkBackendSpawn *backend_spawn, const gchar *line)
ret = FALSE;
goto out;
}
- error_enum = pk_error_enum_from_text (sections[1]);
+ error_enum = pk_error_enum_from_string (sections[1]);
if (error_enum == PK_ERROR_ENUM_UNKNOWN) {
pk_backend_message (backend_spawn->priv->backend, PK_MESSAGE_ENUM_BACKEND_ERROR,
"Error enum not recognised, and hence ignored: '%s'", sections[1]);
@@ -287,7 +287,7 @@ pk_backend_spawn_parse_stdout (PkBackendSpawn *backend_spawn, const gchar *line)
ret = FALSE;
goto out;
}
- restart_enum = pk_restart_enum_from_text (sections[1]);
+ restart_enum = pk_restart_enum_from_string (sections[1]);
if (restart_enum == PK_RESTART_ENUM_UNKNOWN) {
pk_backend_message (backend_spawn->priv->backend, PK_MESSAGE_ENUM_BACKEND_ERROR,
"Restart enum not recognised, and hence ignored: '%s'", sections[1]);
@@ -306,7 +306,7 @@ pk_backend_spawn_parse_stdout (PkBackendSpawn *backend_spawn, const gchar *line)
ret = FALSE;
goto out;
}
- message_enum = pk_message_enum_from_text (sections[1]);
+ message_enum = pk_message_enum_from_string (sections[1]);
if (message_enum == PK_MESSAGE_ENUM_UNKNOWN) {
pk_backend_message (backend_spawn->priv->backend, PK_MESSAGE_ENUM_BACKEND_ERROR,
"Message enum not recognised, and hence ignored: '%s'", sections[1]);
@@ -331,7 +331,7 @@ pk_backend_spawn_parse_stdout (PkBackendSpawn *backend_spawn, const gchar *line)
ret = FALSE;
goto out;
}
- status_enum = pk_status_enum_from_text (sections[1]);
+ status_enum = pk_status_enum_from_string (sections[1]);
if (status_enum == PK_STATUS_ENUM_UNKNOWN) {
pk_backend_message (backend_spawn->priv->backend, PK_MESSAGE_ENUM_BACKEND_ERROR,
"Status enum not recognised, and hence ignored: '%s'", sections[1]);
@@ -369,7 +369,7 @@ pk_backend_spawn_parse_stdout (PkBackendSpawn *backend_spawn, const gchar *line)
goto out;
}
- sig_type = pk_sig_type_enum_from_text (sections[8]);
+ sig_type = pk_sig_type_enum_from_string (sections[8]);
if (sig_type == PK_SIGTYPE_ENUM_UNKNOWN) {
pk_backend_message (backend_spawn->priv->backend, PK_MESSAGE_ENUM_BACKEND_ERROR,
"Sig enum not recognised, and hence ignored: '%s'", sections[8]);
@@ -402,7 +402,7 @@ pk_backend_spawn_parse_stdout (PkBackendSpawn *backend_spawn, const gchar *line)
goto out;
}
- media_type_enum = pk_media_type_enum_from_text (sections[1]);
+ media_type_enum = pk_media_type_enum_from_string (sections[1]);
if (media_type_enum == PK_MEDIA_TYPE_ENUM_UNKNOWN) {
pk_backend_message (backend_spawn->priv->backend, PK_MESSAGE_ENUM_BACKEND_ERROR,
"media type enum not recognised, and hence ignored: '%s'", sections[1]);
@@ -420,7 +420,7 @@ pk_backend_spawn_parse_stdout (PkBackendSpawn *backend_spawn, const gchar *line)
goto out;
}
- distro_upgrade_enum = pk_distro_upgrade_enum_from_text (sections[1]);
+ distro_upgrade_enum = pk_distro_upgrade_enum_from_string (sections[1]);
if (distro_upgrade_enum == PK_DISTRO_UPGRADE_ENUM_UNKNOWN) {
pk_backend_message (backend_spawn->priv->backend, PK_MESSAGE_ENUM_BACKEND_ERROR,
"distro upgrade enum not recognised, and hence ignored: '%s'", sections[1]);
diff --git a/src/pk-backend.c b/src/pk-backend.c
index 465ca4f..a9004f9 100644
--- a/src/pk-backend.c
+++ b/src/pk-backend.c
@@ -766,7 +766,7 @@ pk_backend_set_status (PkBackend *backend, PkStatusEnum status)
/* have we already set an error? */
if (backend->priv->set_error && status != PK_STATUS_ENUM_FINISHED) {
- egg_warning ("already set error, cannot process: status %s", pk_status_enum_to_text (status));
+ egg_warning ("already set error, cannot process: status %s", pk_status_enum_to_string (status));
return FALSE;
}
@@ -774,7 +774,7 @@ pk_backend_set_status (PkBackend *backend, PkStatusEnum status)
if (status == PK_STATUS_ENUM_WAIT) {
egg_warning ("backend tried to WAIT, only the runner should set this value");
pk_backend_message (backend, PK_MESSAGE_ENUM_BACKEND_ERROR,
- "%s shouldn't use STATUS_WAIT", pk_role_enum_to_text (backend->priv->role));
+ "%s shouldn't use STATUS_WAIT", pk_role_enum_to_string (backend->priv->role));
return FALSE;
}
@@ -782,7 +782,7 @@ pk_backend_set_status (PkBackend *backend, PkStatusEnum status)
if (status == PK_STATUS_ENUM_SETUP && backend->priv->status != PK_STATUS_ENUM_WAIT) {
egg_warning ("backend tried to SETUP, but should be in WAIT");
pk_backend_message (backend, PK_MESSAGE_ENUM_BACKEND_ERROR,
- "%s to SETUP when not in WAIT", pk_role_enum_to_text (backend->priv->role));
+ "%s to SETUP when not in WAIT", pk_role_enum_to_string (backend->priv->role));
return FALSE;
}
@@ -999,7 +999,7 @@ pk_backend_package (PkBackend *backend, PkInfoEnum info, const gchar *package_id
/* we automatically set the transaction status for some PkInfoEnums if running
* in non-simultaneous transaction mode */
if (!backend->priv->simultaneous) {
- egg_debug ("auto-setting status based on info %s", pk_info_enum_to_text (info));
+ egg_debug ("auto-setting status based on info %s", pk_info_enum_to_string (info));
if (info == PK_INFO_ENUM_DOWNLOADING)
pk_backend_set_status (backend, PK_STATUS_ENUM_DOWNLOAD);
else if (info == PK_INFO_ENUM_UPDATING)
@@ -1148,7 +1148,7 @@ pk_backend_require_restart (PkBackend *backend, PkRestartEnum restart, const gch
/* have we already set an error? */
if (backend->priv->set_error) {
- egg_warning ("already set error, cannot process: require-restart %s", pk_restart_enum_to_text (restart));
+ egg_warning ("already set error, cannot process: require-restart %s", pk_restart_enum_to_string (restart));
goto out;
}
@@ -1194,7 +1194,7 @@ pk_backend_message (PkBackend *backend, PkMessageEnum message, const gchar *form
/* have we already set an error? */
if (backend->priv->set_error && message != PK_MESSAGE_ENUM_BACKEND_ERROR) {
- egg_warning ("already set error, cannot process: message %s", pk_message_enum_to_text (message));
+ egg_warning ("already set error, cannot process: message %s", pk_message_enum_to_string (message));
goto out;
}
@@ -1873,14 +1873,14 @@ pk_backend_set_role (PkBackend *backend, PkRoleEnum role)
/* Should only be called once... */
if (backend->priv->role != PK_ROLE_ENUM_UNKNOWN) {
egg_warning ("cannot set role more than once, already %s",
- pk_role_enum_to_text (backend->priv->role));
+ pk_role_enum_to_string (backend->priv->role));
return FALSE;
}
/* reset the timer */
pk_time_reset (backend->priv->time);
- egg_debug ("setting role to %s", pk_role_enum_to_text (role));
+ egg_debug ("setting role to %s", pk_role_enum_to_string (role));
backend->priv->role = role;
backend->priv->status = PK_STATUS_ENUM_WAIT;
return TRUE;
@@ -1899,8 +1899,8 @@ pk_backend_set_exit_code (PkBackend *backend, PkExitEnum exit_enum)
if (backend->priv->exit != PK_EXIT_ENUM_UNKNOWN) {
egg_warning ("already set exit status: old=%s, new=%s",
- pk_exit_enum_to_text (backend->priv->exit),
- pk_exit_enum_to_text (exit_enum));
+ pk_exit_enum_to_string (backend->priv->exit),
+ pk_exit_enum_to_string (exit_enum));
egg_debug_backtrace ();
return FALSE;
}
@@ -1950,7 +1950,7 @@ pk_backend_finished (PkBackend *backend)
g_return_val_if_fail (backend->priv->locked != FALSE, FALSE);
/* find out what we just did */
- role_text = pk_role_enum_to_text (backend->priv->role);
+ role_text = pk_role_enum_to_string (backend->priv->role);
egg_debug ("finished role %s", role_text);
/* are we trying to finish in init? */
@@ -2018,10 +2018,10 @@ pk_backend_finished (PkBackend *backend)
}
/**
- * pk_backend_bool_to_text:
+ * pk_backend_bool_to_string:
*/
const gchar *
-pk_backend_bool_to_text (gboolean value)
+pk_backend_bool_to_string (gboolean value)
{
if (value)
return "yes";
diff --git a/src/pk-backend.h b/src/pk-backend.h
index b6a8e8c..4e66dca 100644
--- a/src/pk-backend.h
+++ b/src/pk-backend.h
@@ -189,7 +189,7 @@ gpointer pk_backend_get_pointer (PkBackend *backend,
const gchar *key);
/* helper functions */
-const gchar *pk_backend_bool_to_text (gboolean value);
+const gchar *pk_backend_bool_to_string (gboolean value);
gboolean pk_backend_not_implemented_yet (PkBackend *backend,
const gchar *method);
typedef gboolean (*PkBackendThreadFunc) (PkBackend *backend);
diff --git a/src/pk-engine.c b/src/pk-engine.c
index 4bee361..1385522 100644
--- a/src/pk-engine.c
+++ b/src/pk-engine.c
@@ -617,7 +617,7 @@ pk_engine_get_time_since_action (PkEngine *engine, const gchar *role_text, guint
g_return_val_if_fail (PK_IS_ENGINE (engine), FALSE);
- role = pk_role_enum_from_text (role_text);
+ role = pk_role_enum_from_string (role_text);
*seconds = pk_transaction_db_action_time_since (engine->priv->transaction_db, role);
/* reset the timer */
@@ -876,7 +876,7 @@ pk_engine_set_proxy (PkEngine *engine, const gchar *proxy_http, const gchar *pro
/* insert details about the authorization */
details = polkit_details_new ();
- polkit_details_insert (details, "role", pk_role_enum_to_text (PK_ROLE_ENUM_UNKNOWN));
+ polkit_details_insert (details, "role", pk_role_enum_to_string (PK_ROLE_ENUM_UNKNOWN));
/* do authorization async */
polkit_authority_check_authorization (engine->priv->authority, subject,
@@ -996,7 +996,7 @@ pk_engine_can_authorize (PkEngine *engine, const gchar *action_id, DBusGMethodIn
}
/* all okay */
- dbus_g_method_return (context, pk_authorize_type_enum_to_text (result_enum));
+ dbus_g_method_return (context, pk_authorize_type_enum_to_string (result_enum));
}
/**
@@ -1028,15 +1028,15 @@ pk_engine_get_property (GObject *object, guint prop_id, GValue *value, GParamSpe
g_value_set_string (value, engine->priv->backend_author);
break;
case PROP_ROLES:
- tmp = pk_role_bitfield_to_text (engine->priv->roles);
+ tmp = pk_role_bitfield_to_string (engine->priv->roles);
g_value_set_string (value, tmp);
break;
case PROP_GROUPS:
- tmp = pk_group_bitfield_to_text (engine->priv->groups);
+ tmp = pk_group_bitfield_to_string (engine->priv->groups);
g_value_set_string (value, tmp);
break;
case PROP_FILTERS:
- tmp = pk_filter_bitfield_to_text (engine->priv->filters);
+ tmp = pk_filter_bitfield_to_string (engine->priv->filters);
g_value_set_string (value, tmp);
break;
case PROP_MIME_TYPES:
@@ -1046,7 +1046,7 @@ pk_engine_get_property (GObject *object, guint prop_id, GValue *value, GParamSpe
g_value_set_boolean (value, engine->priv->locked);
break;
case PROP_NETWORK_STATE:
- g_value_set_string (value, pk_network_enum_to_text (engine->priv->network_state));
+ g_value_set_string (value, pk_network_enum_to_string (engine->priv->network_state));
break;
case PROP_DISTRO_ID:
g_value_set_string (value, engine->priv->distro_id);
diff --git a/src/pk-lsof.c b/src/pk-lsof.c
index 3a9efc7..9aa46bb 100644
--- a/src/pk-lsof.c
+++ b/src/pk-lsof.c
@@ -103,10 +103,10 @@ typedef enum {
} PkLsofType;
/**
- * pk_lsof_type_to_text:
+ * pk_lsof_type_to_string:
**/
static const gchar *
-pk_lsof_type_to_text (PkLsofType type)
+pk_lsof_type_to_string (PkLsofType type)
{
if (type == PK_LSOF_TYPE_MEM)
return "mem";
@@ -118,10 +118,10 @@ pk_lsof_type_to_text (PkLsofType type)
}
/**
- * pk_lsof_type_from_text:
+ * pk_lsof_type_from_string:
**/
static PkLsofType
-pk_lsof_type_from_text (const gchar *type)
+pk_lsof_type_from_string (const gchar *type)
{
if (g_ascii_strcasecmp (type, "mem") == 0)
return PK_LSOF_TYPE_MEM;
@@ -185,7 +185,7 @@ pk_lsof_refresh (PkLsof *lsof)
}
break;
case 'f':
- type = pk_lsof_type_from_text (value);
+ type = pk_lsof_type_from_string (value);
break;
case 'n':
if (type == PK_LSOF_TYPE_DEL ||
@@ -209,7 +209,7 @@ pk_lsof_refresh (PkLsof *lsof)
}
break;
default:
- egg_debug ("ignoring %c=%s (type=%s)", mode, value, pk_lsof_type_to_text (type));
+ egg_debug ("ignoring %c=%s (type=%s)", mode, value, pk_lsof_type_to_string (type));
break;
}
}
diff --git a/src/pk-network-stack-connman.c b/src/pk-network-stack-connman.c
index 4dffd05..a05b1d8 100644
--- a/src/pk-network-stack-connman.c
+++ b/src/pk-network-stack-connman.c
@@ -167,7 +167,7 @@ pk_network_stack_connman_get_state (PkNetworkStack *nstack)
value = g_hash_table_lookup (hash_service, "Type");
type = pk_network_stack_connman_get_connection_type (value);
- egg_debug ("network type is %s", pk_network_enum_to_text (type));
+ egg_debug ("network type is %s", pk_network_enum_to_string (type));
g_object_unref (proxy_service);
return type;
}
@@ -193,7 +193,7 @@ pk_network_stack_connman_state_changed (DBusGProxy *proxy, const char *property,
else
ret = FALSE;
/* TODO: this is a PkNetworkState, not a gboolean */
- egg_debug ("emitting network-state-changed: %s", pk_network_enum_to_text (ret));
+ egg_debug ("emitting network-state-changed: %s", pk_network_enum_to_string (ret));
g_signal_emit_by_name (PK_NETWORK_STACK (nstack_connman), "state-changed", ret);
}
diff --git a/src/pk-network-stack-nm.c b/src/pk-network-stack-nm.c
index 16cce0f..e2530af 100644
--- a/src/pk-network-stack-nm.c
+++ b/src/pk-network-stack-nm.c
@@ -248,7 +248,7 @@ pk_network_stack_nm_get_state (PkNetworkStack *nstack)
ret = PK_NETWORK_ENUM_ONLINE;
}
- egg_debug ("network state is %s", pk_network_enum_to_text (ret));
+ egg_debug ("network state is %s", pk_network_enum_to_string (ret));
return ret;
}
@@ -270,7 +270,7 @@ pk_network_stack_nm_nm_changed_cb (libnm_glib_ctx *libnm_ctx, gpointer data)
}
state = pk_network_stack_nm_get_state (PK_NETWORK_STACK (nstack_nm));
- egg_debug ("emitting network-state-changed: %s", pk_network_enum_to_text (state));
+ egg_debug ("emitting network-state-changed: %s", pk_network_enum_to_string (state));
g_signal_emit_by_name (PK_NETWORK_STACK (nstack_nm), "state-changed", state);
}
diff --git a/src/pk-network-stack-unix.c b/src/pk-network-stack-unix.c
index c5bdfd0..79b51b7 100644
--- a/src/pk-network-stack-unix.c
+++ b/src/pk-network-stack-unix.c
@@ -190,7 +190,7 @@ pk_network_stack_unix_file_monitor_changed_cb (PkFileMonitor *file_monitor, PkNe
/* new state */
nstack_unix->priv->state_old = state;
- egg_debug ("emitting network-state-changed: %s", pk_network_enum_to_text (state));
+ egg_debug ("emitting network-state-changed: %s", pk_network_enum_to_string (state));
g_signal_emit_by_name (PK_NETWORK_STACK (nstack_unix), "state-changed", state);
}
diff --git a/src/pk-network.c b/src/pk-network.c
index 6661a3e..925cf1a 100644
--- a/src/pk-network.c
+++ b/src/pk-network.c
@@ -112,7 +112,7 @@ pk_network_stack_state_changed_cb (PkNetworkStack *nstack, PkNetworkEnum state,
{
g_return_if_fail (PK_IS_NETWORK (network));
- egg_debug ("emitting network-state-changed: %s", pk_network_enum_to_text (state));
+ egg_debug ("emitting network-state-changed: %s", pk_network_enum_to_string (state));
g_signal_emit (network, signals [PK_NETWORK_STATE_CHANGED], 0, state);
}
diff --git a/src/pk-polkit-action-lookup.c b/src/pk-polkit-action-lookup.c
index 0f260bd..01ea7ad 100644
--- a/src/pk-polkit-action-lookup.c
+++ b/src/pk-polkit-action-lookup.c
@@ -136,7 +136,7 @@ pk_action_lookup_get_message (PolkitBackendActionLookup *lookup, const gchar *ac
/* get role */
role_text = polkit_details_lookup (details, "role");
if (role_text != NULL)
- role = pk_role_enum_from_text (role_text);
+ role = pk_role_enum_from_string (role_text);
/* get only-trusted */
only_trusted_text = polkit_details_lookup (details, "only-trusted");
@@ -158,7 +158,7 @@ pk_action_lookup_get_message (PolkitBackendActionLookup *lookup, const gchar *ac
/* find out the number of packages so we pluralize corectly */
str = polkit_details_lookup (details, "package_ids");
if (str != NULL) {
- package_ids = pk_package_ids_from_text (str);
+ package_ids = pk_package_ids_from_string (str);
len = g_strv_length (package_ids);
g_strfreev (package_ids);
}
@@ -224,7 +224,7 @@ pk_action_lookup_get_icon_name (PolkitBackendActionLookup *lookup, const gchar *
/* get role */
role_text = polkit_details_lookup (details, "role");
if (role_text != NULL)
- role = pk_role_enum_from_text (role_text);
+ role = pk_role_enum_from_string (role_text);
/* get only-trusted */
only_trusted_text = polkit_details_lookup (details, "only-trusted");
@@ -349,7 +349,7 @@ pk_action_lookup_get_details (PolkitBackendActionLookup *lookup, const gchar *ac
/* packages */
str = polkit_details_lookup (action_details, "package_ids");
if (str != NULL) {
- package_ids = pk_package_ids_from_text (str);
+ package_ids = pk_package_ids_from_string (str);
text = pk_action_lookup_package_ids_to_string (package_ids);
len = g_strv_length (package_ids);
diff --git a/src/pk-shared.c b/src/pk-shared.c
index f41abec..30fa25d 100644
--- a/src/pk-shared.c
+++ b/src/pk-shared.c
@@ -83,10 +83,10 @@ out:
}
/**
- * pk_hint_enum_to_text:
+ * pk_hint_enum_to_string:
**/
const gchar *
-pk_hint_enum_to_text (PkHintEnum hint)
+pk_hint_enum_to_string (PkHintEnum hint)
{
if (hint == PK_HINT_ENUM_FALSE)
return "false";
@@ -98,10 +98,10 @@ pk_hint_enum_to_text (PkHintEnum hint)
}
/**
- * pk_hint_enum_from_text:
+ * pk_hint_enum_from_string:
**/
PkHintEnum
-pk_hint_enum_from_text (const gchar *hint)
+pk_hint_enum_from_string (const gchar *hint)
{
if (g_strcmp0 (hint, "false") == 0)
return PK_HINT_ENUM_FALSE;
diff --git a/src/pk-shared.h b/src/pk-shared.h
index 7e8d202..5048ee7 100644
--- a/src/pk-shared.h
+++ b/src/pk-shared.h
@@ -36,8 +36,8 @@ typedef enum {
} PkHintEnum;
gboolean pk_directory_remove_contents (const gchar *directory);
-const gchar *pk_hint_enum_to_text (PkHintEnum hint);
-PkHintEnum pk_hint_enum_from_text (const gchar *hint);
+const gchar *pk_hint_enum_to_string (PkHintEnum hint);
+PkHintEnum pk_hint_enum_from_string (const gchar *hint);
G_END_DECLS
diff --git a/src/pk-spawn.c b/src/pk-spawn.c
index 0ba186f..d21e281 100644
--- a/src/pk-spawn.c
+++ b/src/pk-spawn.c
@@ -153,10 +153,10 @@ pk_spawn_emit_whole_lines (PkSpawn *spawn, GString *string)
}
/**
- * pk_spawn_exit_type_enum_to_text:
+ * pk_spawn_exit_type_enum_to_string:
**/
static const gchar *
-pk_spawn_exit_type_enum_to_text (PkSpawnExitType type)
+pk_spawn_exit_type_enum_to_string (PkSpawnExitType type)
{
if (type == PK_SPAWN_EXIT_TYPE_SUCCESS)
return "success";
@@ -249,7 +249,7 @@ pk_spawn_check_child (PkSpawn *spawn)
spawn->priv->exit = PK_SPAWN_EXIT_TYPE_DISPATCHER_EXIT;
/* don't emit if we just closed an invalid dispatcher */
- egg_debug ("emitting exit %s", pk_spawn_exit_type_enum_to_text (spawn->priv->exit));
+ egg_debug ("emitting exit %s", pk_spawn_exit_type_enum_to_string (spawn->priv->exit));
g_signal_emit (spawn, signals [SIGNAL_EXIT], 0, spawn->priv->exit);
return FALSE;
diff --git a/src/pk-transaction-db.c b/src/pk-transaction-db.c
index a6a8fba..4760f52 100644
--- a/src/pk-transaction-db.c
+++ b/src/pk-transaction-db.c
@@ -109,7 +109,7 @@ pk_transaction_sqlite_transaction_cb (void *data, gint argc, gchar **argv, gchar
g_object_set (item, "succeeded", FALSE, NULL);
} else if (g_strcmp0 (col, "role") == 0) {
if (value != NULL)
- g_object_set (item, "role", pk_role_enum_from_text (value), NULL);
+ g_object_set (item, "role", pk_role_enum_from_string (value), NULL);
} else if (g_strcmp0 (col, "transaction_id") == 0) {
if (value != NULL)
g_object_set (item, "tid", value, NULL);
@@ -237,7 +237,7 @@ pk_transaction_db_action_time_since (PkTransactionDb *tdb, PkRoleEnum role)
g_return_val_if_fail (PK_IS_TRANSACTION_DB (tdb), 0);
g_return_val_if_fail (tdb->priv->db != NULL, 0);
- role_text = pk_role_enum_to_text (role);
+ role_text = pk_role_enum_to_string (role);
egg_debug ("get_time_since_action=%s", role_text);
statement = g_strdup_printf ("SELECT timespec FROM last_action WHERE role = '%s'", role_text);
@@ -279,7 +279,7 @@ pk_transaction_db_action_time_reset (PkTransactionDb *tdb, PkRoleEnum role)
g_return_val_if_fail (tdb->priv->db != NULL, FALSE);
timespec = pk_iso8601_present ();
- role_text = pk_role_enum_to_text (role);
+ role_text = pk_role_enum_to_string (role);
/* get the previous entry */
since = pk_transaction_db_action_time_since (tdb, role);
@@ -364,7 +364,7 @@ pk_transaction_db_set_role (PkTransactionDb *tdb, const gchar *tid, PkRoleEnum r
g_return_val_if_fail (PK_IS_TRANSACTION_DB (tdb), FALSE);
- role_text = pk_role_enum_to_text (role);
+ role_text = pk_role_enum_to_string (role);
statement = g_strdup_printf ("UPDATE transactions SET role = '%s' WHERE transaction_id = '%s'", role_text, tid);
pk_transaction_db_sql_statement (tdb, statement);
g_free (statement);
diff --git a/src/pk-transaction-extra.c b/src/pk-transaction-extra.c
index 8a8e45e..05ef2f7 100644
--- a/src/pk-transaction-extra.c
+++ b/src/pk-transaction-extra.c
@@ -100,7 +100,7 @@ pk_transaction_extra_package_cb (PkBackend *backend, PkPackage *package, PkTrans
static void
pk_transaction_extra_set_require_restart (PkTransactionExtra *extra, PkRestartEnum restart, const gchar *package_id)
{
- egg_debug ("emit require-restart %s, %s", pk_restart_enum_to_text (restart), package_id);
+ egg_debug ("emit require-restart %s, %s", pk_restart_enum_to_string (restart), package_id);
g_signal_emit (extra, signals [PK_POST_TRANS_REQUIRE_RESTART], 0, restart, package_id);
}
@@ -110,7 +110,7 @@ pk_transaction_extra_set_require_restart (PkTransactionExtra *extra, PkRestartEn
static void
pk_transaction_extra_set_status_changed (PkTransactionExtra *extra, PkStatusEnum status)
{
- egg_debug ("emiting status-changed %s", pk_status_enum_to_text (status));
+ egg_debug ("emiting status-changed %s", pk_status_enum_to_string (status));
g_signal_emit (extra, signals [PK_POST_TRANS_STATUS_CHANGED], 0, status);
}
@@ -472,7 +472,7 @@ pk_transaction_extra_package_list_to_string (GPtrArray *array)
"package-id", &package_id,
"summary", &summary,
NULL);
- g_string_append_printf (string, "%s\t%s\t%s\n", pk_info_enum_to_text (info), package_id, summary);
+ g_string_append_printf (string, "%s\t%s\t%s\n", pk_info_enum_to_string (info), package_id, summary);
g_free (package_id);
g_free (summary);
}
diff --git a/src/pk-transaction-list.c b/src/pk-transaction-list.c
index d76a0d3..5b0074b 100644
--- a/src/pk-transaction-list.c
+++ b/src/pk-transaction-list.c
@@ -672,7 +672,7 @@ pk_transaction_list_get_state (PkTransactionList *tlist)
wrong++;
role = pk_transaction_priv_get_role (item->transaction);
g_string_append_printf (string, "%0i\t%s\t%s\trunning[%i] committed[%i] finished[%i] background[%i]\n", i,
- pk_role_enum_to_text (role), item->tid, item->running,
+ pk_role_enum_to_string (role), item->tid, item->running,
item->committed, item->finished, item->background);
}
diff --git a/src/pk-transaction.c b/src/pk-transaction.c
index 13df030..669d0f3 100644
--- a/src/pk-transaction.c
+++ b/src/pk-transaction.c
@@ -409,7 +409,7 @@ static void
pk_transaction_finished_emit (PkTransaction *transaction, PkExitEnum exit_enum, guint time_ms)
{
const gchar *exit_text;
- exit_text = pk_exit_enum_to_text (exit_enum);
+ exit_text = pk_exit_enum_to_string (exit_enum);
egg_debug ("emitting finished '%s', %i", exit_text, time_ms);
g_signal_emit (transaction, signals[SIGNAL_FINISHED], 0, exit_text, time_ms);
}
@@ -421,7 +421,7 @@ static void
pk_transaction_error_code_emit (PkTransaction *transaction, PkErrorEnum error_enum, const gchar *details)
{
const gchar *text;
- text = pk_error_enum_to_text (error_enum);
+ text = pk_error_enum_to_string (error_enum);
egg_debug ("emitting error-code %s, '%s'", text, details);
g_signal_emit (transaction, signals[SIGNAL_ERROR_CODE], 0, text, details);
}
@@ -491,7 +491,7 @@ pk_transaction_details_cb (PkBackend *backend, PkDetails *item, PkTransaction *t
NULL);
/* emit */
- group_text = pk_group_enum_to_text (group);
+ group_text = pk_group_enum_to_string (group);
egg_debug ("emitting details");
g_signal_emit (transaction, signals[SIGNAL_DETAILS], 0, package_id,
license, group_text, description, url, size);
@@ -523,7 +523,7 @@ pk_transaction_error_code_cb (PkBackend *backend, PkError *item, PkTransaction *
if (code == PK_ERROR_ENUM_UNKNOWN) {
pk_backend_message (transaction->priv->backend, PK_MESSAGE_ENUM_BACKEND_ERROR,
"%s emitted 'unknown error' rather than a specific error "
- "- this is a backend problem and should be fixed!", pk_role_enum_to_text (transaction->priv->role));
+ "- this is a backend problem and should be fixed!", pk_role_enum_to_string (transaction->priv->role));
}
/* add to results */
@@ -641,7 +641,7 @@ pk_transaction_distro_upgrade_cb (PkBackend *backend, PkDistroUpgrade *item, PkT
NULL);
/* emit */
- type_text = pk_distro_upgrade_enum_to_text (state);
+ type_text = pk_distro_upgrade_enum_to_string (state);
egg_debug ("emitting distro-upgrade %s, %s, %s", type_text, name, summary);
g_signal_emit (transaction, signals[SIGNAL_DISTRO_UPGRADE], 0, type_text, name, summary);
@@ -671,7 +671,7 @@ pk_transaction_package_list_to_string (GPtrArray *array)
"summary", &summary,
NULL);
g_string_append_printf (string, "%s\t%s\t%s\n",
- pk_info_enum_to_text (info),
+ pk_info_enum_to_string (info),
package_id, summary);
g_free (package_id);
g_free (summary);
@@ -900,8 +900,8 @@ pk_transaction_finished_cb (PkBackend *backend, PkExitEnum exit_enum, PkTransact
info == PK_INFO_ENUM_INSTALLING ||
info == PK_INFO_ENUM_UPDATING) {
pk_syslog_add (transaction->priv->syslog, PK_SYSLOG_TYPE_INFO, "in %s for %s package %s was %s for uid %i",
- transaction->priv->tid, pk_role_enum_to_text (transaction->priv->role),
- package_id, pk_info_enum_to_text (info), transaction->priv->uid);
+ transaction->priv->tid, pk_role_enum_to_string (transaction->priv->role),
+ package_id, pk_info_enum_to_string (info), transaction->priv->uid);
}
g_free (package_id);
}
@@ -931,11 +931,11 @@ pk_transaction_finished_cb (PkBackend *backend, PkExitEnum exit_enum, PkTransact
/* report to syslog */
if (transaction->priv->uid != PK_TRANSACTION_UID_INVALID)
pk_syslog_add (transaction->priv->syslog, PK_SYSLOG_TYPE_INFO, "%s transaction %s from uid %i finished with %s after %ims",
- pk_role_enum_to_text (transaction->priv->role), transaction->priv->tid,
- transaction->priv->uid, pk_exit_enum_to_text (exit_enum), time_ms);
+ pk_role_enum_to_string (transaction->priv->role), transaction->priv->tid,
+ transaction->priv->uid, pk_exit_enum_to_string (exit_enum), time_ms);
else
pk_syslog_add (transaction->priv->syslog, PK_SYSLOG_TYPE_INFO, "%s transaction %s finished with %s after %ims",
- pk_role_enum_to_text (transaction->priv->role), transaction->priv->tid, pk_exit_enum_to_text (exit_enum), time_ms);
+ pk_role_enum_to_string (transaction->priv->role), transaction->priv->tid, pk_exit_enum_to_string (exit_enum), time_ms);
/* we emit last, as other backends will be running very soon after us, and we don't want to be notified */
pk_transaction_finished_emit (transaction, exit_enum, time_ms);
@@ -974,7 +974,7 @@ pk_transaction_message_cb (PkBackend *backend, PkMessage *item, PkTransaction *t
pk_results_add_message (transaction->priv->results, item);
/* emit */
- message_text = pk_message_enum_to_text (type);
+ message_text = pk_message_enum_to_string (type);
egg_debug ("emitting message %s, '%s'", message_text, details);
g_signal_emit (transaction, signals[SIGNAL_MESSAGE], 0, message_text, details);
@@ -1003,7 +1003,7 @@ pk_transaction_package_cb (PkBackend *backend, PkPackage *item, PkTransaction *t
}
/* we need this in warnings */
- role_text = pk_role_enum_to_text (transaction->priv->role);
+ role_text = pk_role_enum_to_string (transaction->priv->role);
/* get data */
g_object_get (item,
@@ -1049,7 +1049,7 @@ pk_transaction_package_cb (PkBackend *backend, PkPackage *item, PkTransaction *t
/* emit */
g_free (transaction->priv->last_package_id);
transaction->priv->last_package_id = g_strdup (package_id);
- info_text = pk_info_enum_to_text (info);
+ info_text = pk_info_enum_to_string (info);
egg_debug ("emit package %s, %s, %s", info_text, package_id, summary);
g_signal_emit (transaction, signals[SIGNAL_PACKAGE], 0, info_text, package_id, summary);
g_free (package_id);
@@ -1135,7 +1135,7 @@ pk_transaction_repo_signature_required_cb (PkBackend *backend, PkRepoSignatureRe
NULL);
/* emit */
- type_text = pk_sig_type_enum_to_text (type);
+ type_text = pk_sig_type_enum_to_string (type);
egg_debug ("emitting repo_signature_required %s, %s, %s, %s, %s, %s, %s, %s",
package_id, repository_name, key_url, key_userid, key_id,
key_fingerprint, key_timestamp, type_text);
@@ -1220,7 +1220,7 @@ pk_transaction_media_change_required_cb (PkBackend *backend, PkMediaChangeRequir
NULL);
/* emit */
- media_type_text = pk_media_type_enum_to_text (media_type);
+ media_type_text = pk_media_type_enum_to_string (media_type);
egg_debug ("emitting media-change-required %s, %s, %s",
media_type_text, media_id, media_text);
g_signal_emit (transaction, signals[SIGNAL_MEDIA_CHANGE_REQUIRED], 0,
@@ -1274,7 +1274,7 @@ pk_transaction_require_restart_cb (PkBackend *backend, PkRequireRestart *item, P
g_ptr_array_unref (array);
/* ignore */
- restart_text = pk_restart_enum_to_text (restart);
+ restart_text = pk_restart_enum_to_string (restart);
if (found) {
egg_debug ("ignoring %s (%s) as already sent", restart_text, package_id);
return;
@@ -1301,7 +1301,7 @@ pk_transaction_status_changed_cb (PkBackend *backend, PkStatusEnum status, PkTra
/* have we already been marked as finished? */
if (transaction->priv->finished) {
- egg_warning ("Already finished, so can't proxy status %s", pk_status_enum_to_text (status));
+ egg_warning ("Already finished, so can't proxy status %s", pk_status_enum_to_string (status));
return;
}
@@ -1343,7 +1343,7 @@ pk_transaction_transaction_cb (PkTransactionDb *tdb, PkTransactionPast *item, Pk
NULL);
/* emit */
- role_text = pk_role_enum_to_text (role);
+ role_text = pk_role_enum_to_string (role);
egg_debug ("emitting transaction %s, %s, %i, %s, %i, %s, %i, %s",
tid, timespec, succeeded, role_text,
duration, data, uid, cmdline);
@@ -1402,8 +1402,8 @@ pk_transaction_update_detail_cb (PkBackend *backend, PkUpdateDetail *item, PkTra
/* emit */
egg_debug ("emitting update-detail");
- restart_text = pk_restart_enum_to_text (restart);
- state_text = pk_update_state_enum_to_text (state);
+ restart_text = pk_restart_enum_to_string (restart);
+ state_text = pk_update_state_enum_to_string (state);
g_signal_emit (transaction, signals[SIGNAL_UPDATE_DETAIL], 0,
package_id, updates, obsoletes, vendor_url,
bugzilla_url, cve_url, restart_text, update_text,
@@ -1450,7 +1450,7 @@ pk_transaction_pre_transaction_checks (PkTransaction *transaction, gchar **packa
/* check we have anything to process */
if (package_ids == NULL) {
- egg_debug ("no package_ids for %s", pk_role_enum_to_text (transaction->priv->role));
+ egg_debug ("no package_ids for %s", pk_role_enum_to_string (transaction->priv->role));
goto out;
}
@@ -1626,7 +1626,7 @@ pk_transaction_set_running (PkTransaction *transaction)
/* set the role */
pk_backend_set_role (priv->backend, priv->role);
- egg_debug ("setting role for %s to %s", priv->tid, pk_role_enum_to_text (priv->role));
+ egg_debug ("setting role for %s to %s", priv->tid, pk_role_enum_to_string (priv->role));
/* set proxy */
ret = pk_transaction_set_proxy (transaction, &error);
@@ -1950,7 +1950,7 @@ pk_transaction_commit (PkTransaction *transaction)
/* report to syslog */
pk_syslog_add (transaction->priv->syslog, PK_SYSLOG_TYPE_INFO, "new %s transaction %s scheduled from uid %i",
- pk_role_enum_to_text (transaction->priv->role), transaction->priv->tid, transaction->priv->uid);
+ pk_role_enum_to_string (transaction->priv->role), transaction->priv->tid, transaction->priv->uid);
}
return TRUE;
}
@@ -2128,7 +2128,7 @@ pk_transaction_filter_check (const gchar *filter, GError **error)
"Single empty section of filter: %s", filter);
goto out;
}
- if (pk_filter_enum_from_text (sections[i]) == PK_FILTER_ENUM_UNKNOWN) {
+ if (pk_filter_enum_from_string (sections[i]) == PK_FILTER_ENUM_UNKNOWN) {
*error = g_error_new (PK_TRANSACTION_ERROR, PK_TRANSACTION_ERROR_INPUT_INVALID,
"Unknown filter part: %s", sections[i]);
goto out;
@@ -2310,7 +2310,7 @@ pk_transaction_obtain_authorization (PkTransaction *transaction, gboolean only_t
else
action_id = pk_transaction_role_to_action_allow_untrusted (role);
if (action_id == NULL) {
- *error = g_error_new (PK_TRANSACTION_ERROR, PK_TRANSACTION_ERROR_REFUSED_BY_POLICY, "policykit type required for '%s'", pk_role_enum_to_text (role));
+ *error = g_error_new (PK_TRANSACTION_ERROR, PK_TRANSACTION_ERROR_REFUSED_BY_POLICY, "policykit type required for '%s'", pk_role_enum_to_string (role));
goto out;
}
@@ -2326,14 +2326,14 @@ pk_transaction_obtain_authorization (PkTransaction *transaction, gboolean only_t
/* insert details about the authorization */
details = polkit_details_new ();
- polkit_details_insert (details, "role", pk_role_enum_to_text (transaction->priv->role));
+ polkit_details_insert (details, "role", pk_role_enum_to_string (transaction->priv->role));
polkit_details_insert (details, "only-trusted", transaction->priv->cached_only_trusted ? "true" : "false");
/* do we have package details? */
if (transaction->priv->cached_package_id != NULL)
package_ids = g_strdup (transaction->priv->cached_package_id);
else if (transaction->priv->cached_package_ids != NULL)
- package_ids = pk_package_ids_to_text (transaction->priv->cached_package_ids);
+ package_ids = pk_package_ids_to_string (transaction->priv->cached_package_ids);
/* save optional stuff */
if (package_ids != NULL)
@@ -2552,7 +2552,7 @@ pk_transaction_cancel (PkTransaction *transaction, DBusGMethodInvocation *contex
error = g_error_new (PK_TRANSACTION_ERROR, PK_TRANSACTION_ERROR_CANNOT_CANCEL,
"Tried to cancel %s (%s) that is not safe to kill",
transaction->priv->tid,
- pk_role_enum_to_text (transaction->priv->role));
+ pk_role_enum_to_string (transaction->priv->role));
pk_transaction_dbus_return_error (context, error);
goto out;
}
@@ -2673,7 +2673,7 @@ pk_transaction_download_packages (PkTransaction *transaction, gchar **package_id
/* check package_ids */
ret = pk_package_ids_check (package_ids);
if (!ret) {
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
error = g_error_new (PK_TRANSACTION_ERROR, PK_TRANSACTION_ERROR_PACKAGE_ID_INVALID,
"The package id's '%s' are not valid", package_ids_temp);
g_free (package_ids_temp);
@@ -2785,7 +2785,7 @@ pk_transaction_get_depends (PkTransaction *transaction, const gchar *filter, gch
g_return_if_fail (PK_IS_TRANSACTION (transaction));
g_return_if_fail (transaction->priv->tid != NULL);
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
egg_debug ("GetDepends method called: %s (recursive %i)", package_ids_temp, recursive);
g_free (package_ids_temp);
@@ -2828,7 +2828,7 @@ pk_transaction_get_depends (PkTransaction *transaction, const gchar *filter, gch
/* check package_ids */
ret = pk_package_ids_check (package_ids);
if (!ret) {
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
error = g_error_new (PK_TRANSACTION_ERROR, PK_TRANSACTION_ERROR_PACKAGE_ID_INVALID,
"The package id's '%s' are not valid", package_ids_temp);
g_free (package_ids_temp);
@@ -2838,7 +2838,7 @@ pk_transaction_get_depends (PkTransaction *transaction, const gchar *filter, gch
}
/* save so we can run later */
- transaction->priv->cached_filters = pk_filter_bitfield_from_text (filter);
+ transaction->priv->cached_filters = pk_filter_bitfield_from_string (filter);
transaction->priv->cached_package_ids = g_strdupv (package_ids);
transaction->priv->cached_force = recursive;
pk_transaction_set_role (transaction, PK_ROLE_ENUM_GET_DEPENDS);
@@ -2872,7 +2872,7 @@ pk_transaction_get_details (PkTransaction *transaction, gchar **package_ids, DBu
g_return_if_fail (PK_IS_TRANSACTION (transaction));
g_return_if_fail (transaction->priv->tid != NULL);
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
egg_debug ("GetDetails method called: %s", package_ids_temp);
g_free (package_ids_temp);
@@ -2907,7 +2907,7 @@ pk_transaction_get_details (PkTransaction *transaction, gchar **package_ids, DBu
/* check package_ids */
ret = pk_package_ids_check (package_ids);
if (!ret) {
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
error = g_error_new (PK_TRANSACTION_ERROR, PK_TRANSACTION_ERROR_PACKAGE_ID_INVALID,
"The package id's '%s' are not valid", package_ids_temp);
g_free (package_ids_temp);
@@ -2999,7 +2999,7 @@ pk_transaction_get_files (PkTransaction *transaction, gchar **package_ids, DBusG
g_return_if_fail (PK_IS_TRANSACTION (transaction));
g_return_if_fail (transaction->priv->tid != NULL);
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
egg_debug ("GetFiles method called: %s", package_ids_temp);
g_free (package_ids_temp);
@@ -3034,7 +3034,7 @@ pk_transaction_get_files (PkTransaction *transaction, gchar **package_ids, DBusG
/* check package_ids */
ret = pk_package_ids_check (package_ids);
if (!ret) {
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
error = g_error_new (PK_TRANSACTION_ERROR, PK_TRANSACTION_ERROR_PACKAGE_ID_INVALID,
"The package id's '%s' are not valid", package_ids_temp);
g_free (package_ids_temp);
@@ -3101,7 +3101,7 @@ pk_transaction_get_packages (PkTransaction *transaction, const gchar *filter, DB
}
/* save so we can run later */
- transaction->priv->cached_filters = pk_filter_bitfield_from_text (filter);
+ transaction->priv->cached_filters = pk_filter_bitfield_from_string (filter);
pk_transaction_set_role (transaction, PK_ROLE_ENUM_GET_PACKAGES);
/* try to commit this */
@@ -3176,7 +3176,7 @@ pk_transaction_get_repo_list (PkTransaction *transaction, const gchar *filter, D
}
/* save so we can run later */
- transaction->priv->cached_filters = pk_filter_bitfield_from_text (filter);
+ transaction->priv->cached_filters = pk_filter_bitfield_from_string (filter);
pk_transaction_set_role (transaction, PK_ROLE_ENUM_GET_REPO_LIST);
/* try to commit this */
@@ -3209,7 +3209,7 @@ pk_transaction_get_requires (PkTransaction *transaction, const gchar *filter, gc
g_return_if_fail (PK_IS_TRANSACTION (transaction));
g_return_if_fail (transaction->priv->tid != NULL);
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
egg_debug ("GetRequires method called: %s (recursive %i)", package_ids_temp, recursive);
g_free (package_ids_temp);
@@ -3252,7 +3252,7 @@ pk_transaction_get_requires (PkTransaction *transaction, const gchar *filter, gc
/* check package_ids */
ret = pk_package_ids_check (package_ids);
if (!ret) {
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
error = g_error_new (PK_TRANSACTION_ERROR, PK_TRANSACTION_ERROR_PACKAGE_ID_INVALID,
"The package id's '%s' are not valid", package_ids_temp);
g_free (package_ids_temp);
@@ -3262,7 +3262,7 @@ pk_transaction_get_requires (PkTransaction *transaction, const gchar *filter, gc
}
/* save so we can run later */
- transaction->priv->cached_filters = pk_filter_bitfield_from_text (filter);
+ transaction->priv->cached_filters = pk_filter_bitfield_from_string (filter);
transaction->priv->cached_package_ids = g_strdupv (package_ids);
transaction->priv->cached_force = recursive;
pk_transaction_set_role (transaction, PK_ROLE_ENUM_GET_REQUIRES);
@@ -3297,7 +3297,7 @@ pk_transaction_get_update_detail (PkTransaction *transaction, gchar **package_id
g_return_if_fail (PK_IS_TRANSACTION (transaction));
g_return_if_fail (transaction->priv->tid != NULL);
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
egg_debug ("GetUpdateDetail method called: %s", package_ids_temp);
g_free (package_ids_temp);
@@ -3332,7 +3332,7 @@ pk_transaction_get_update_detail (PkTransaction *transaction, gchar **package_id
/* check package_ids */
ret = pk_package_ids_check (package_ids);
if (!ret) {
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
error = g_error_new (PK_TRANSACTION_ERROR, PK_TRANSACTION_ERROR_PACKAGE_ID_INVALID,
"The package id's '%s' are not valid", package_ids_temp);
g_free (package_ids_temp);
@@ -3400,7 +3400,7 @@ pk_transaction_get_updates (PkTransaction *transaction, const gchar *filter, DBu
}
/* save so we can run later */
- transaction->priv->cached_filters = pk_filter_bitfield_from_text (filter);
+ transaction->priv->cached_filters = pk_filter_bitfield_from_string (filter);
pk_transaction_set_role (transaction, PK_ROLE_ENUM_GET_UPDATES);
/* try and reuse cache */
@@ -3423,7 +3423,7 @@ pk_transaction_get_updates (PkTransaction *transaction, const gchar *filter, DBu
"package-id", &package_id,
"summary", &summary,
NULL);
- info_text = pk_info_enum_to_text (info);
+ info_text = pk_info_enum_to_string (info);
egg_debug ("emitting package");
g_signal_emit (transaction, signals[SIGNAL_PACKAGE], 0,
info_text, package_id, summary);
@@ -3533,7 +3533,7 @@ pk_transaction_install_files (PkTransaction *transaction, gboolean only_trusted,
g_return_if_fail (PK_IS_TRANSACTION (transaction));
g_return_if_fail (transaction->priv->tid != NULL);
- full_paths_temp = pk_package_ids_to_text (full_paths);
+ full_paths_temp = pk_package_ids_to_string (full_paths);
egg_debug ("InstallFiles method called: %s (only_trusted %i)", full_paths_temp, only_trusted);
g_free (full_paths_temp);
@@ -3639,7 +3639,7 @@ pk_transaction_install_packages (PkTransaction *transaction, gboolean only_trust
g_return_if_fail (PK_IS_TRANSACTION (transaction));
g_return_if_fail (transaction->priv->tid != NULL);
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
egg_debug ("InstallPackages method called: %s", package_ids_temp);
g_free (package_ids_temp);
@@ -3674,7 +3674,7 @@ pk_transaction_install_packages (PkTransaction *transaction, gboolean only_trust
/* check package_ids */
ret = pk_package_ids_check (package_ids);
if (!ret) {
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
error = g_error_new (PK_TRANSACTION_ERROR, PK_TRANSACTION_ERROR_PACKAGE_ID_INVALID,
"The package id's '%s' are not valid", package_ids_temp);
g_free (package_ids_temp);
@@ -3837,7 +3837,7 @@ pk_transaction_remove_packages (PkTransaction *transaction, gchar **package_ids,
g_return_if_fail (PK_IS_TRANSACTION (transaction));
g_return_if_fail (transaction->priv->tid != NULL);
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
egg_debug ("RemovePackages method called: %s, %i, %i", package_ids_temp, allow_deps, autoremove);
g_free (package_ids_temp);
@@ -3872,7 +3872,7 @@ pk_transaction_remove_packages (PkTransaction *transaction, gchar **package_ids,
/* check package_ids */
ret = pk_package_ids_check (package_ids);
if (!ret) {
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
error = g_error_new (PK_TRANSACTION_ERROR, PK_TRANSACTION_ERROR_PACKAGE_ID_INVALID,
"The package id's '%s' are not valid", package_ids_temp);
g_free (package_ids_temp);
@@ -4036,7 +4036,7 @@ pk_transaction_resolve (PkTransaction *transaction, const gchar *filter,
g_return_if_fail (PK_IS_TRANSACTION (transaction));
g_return_if_fail (transaction->priv->tid != NULL);
- packages_temp = pk_package_ids_to_text (packages);
+ packages_temp = pk_package_ids_to_string (packages);
egg_debug ("Resolve method called: %s, %s", filter, packages_temp);
g_free (packages_temp);
@@ -4090,7 +4090,7 @@ pk_transaction_resolve (PkTransaction *transaction, const gchar *filter,
/* save so we can run later */
transaction->priv->cached_package_ids = g_strdupv (packages);
- transaction->priv->cached_filters = pk_filter_bitfield_from_text (filter);
+ transaction->priv->cached_filters = pk_filter_bitfield_from_string (filter);
pk_transaction_set_role (transaction, PK_ROLE_ENUM_RESOLVE);
/* try to commit this */
@@ -4214,7 +4214,7 @@ pk_transaction_search_details (PkTransaction *transaction, const gchar *filter,
}
/* save so we can run later */
- transaction->priv->cached_filters = pk_filter_bitfield_from_text (filter);
+ transaction->priv->cached_filters = pk_filter_bitfield_from_string (filter);
transaction->priv->cached_values = g_strdupv (values);
pk_transaction_set_role (transaction, PK_ROLE_ENUM_SEARCH_DETAILS);
@@ -4293,7 +4293,7 @@ pk_transaction_search_files (PkTransaction *transaction, const gchar *filter,
}
/* save so we can run later */
- transaction->priv->cached_filters = pk_filter_bitfield_from_text (filter);
+ transaction->priv->cached_filters = pk_filter_bitfield_from_string (filter);
transaction->priv->cached_values = g_strdupv (values);
pk_transaction_set_role (transaction, PK_ROLE_ENUM_SEARCH_FILE);
@@ -4372,7 +4372,7 @@ pk_transaction_search_groups (PkTransaction *transaction, const gchar *filter,
}
/* save so we can run later */
- transaction->priv->cached_filters = pk_filter_bitfield_from_text (filter);
+ transaction->priv->cached_filters = pk_filter_bitfield_from_string (filter);
transaction->priv->cached_values = g_strdupv (values);
pk_transaction_set_role (transaction, PK_ROLE_ENUM_SEARCH_GROUP);
@@ -4439,7 +4439,7 @@ pk_transaction_search_names (PkTransaction *transaction, const gchar *filter,
}
/* save so we can run later */
- transaction->priv->cached_filters = pk_filter_bitfield_from_text (filter);
+ transaction->priv->cached_filters = pk_filter_bitfield_from_string (filter);
transaction->priv->cached_values = g_strdupv (values);
pk_transaction_set_role (transaction, PK_ROLE_ENUM_SEARCH_NAME);
@@ -4524,7 +4524,7 @@ pk_transaction_set_hint (PkTransaction *transaction, const gchar *key, const gch
/* background=true */
if (g_strcmp0 (key, "background") == 0) {
- priv->background = pk_hint_enum_from_text (value);
+ priv->background = pk_hint_enum_from_string (value);
if (priv->background == PK_HINT_ENUM_INVALID) {
priv->background = PK_HINT_ENUM_UNSET;
*error = g_error_new (PK_TRANSACTION_ERROR, PK_TRANSACTION_ERROR_NOT_SUPPORTED,
@@ -4536,7 +4536,7 @@ pk_transaction_set_hint (PkTransaction *transaction, const gchar *key, const gch
/* interactive=true */
if (g_strcmp0 (key, "interactive") == 0) {
- priv->interactive = pk_hint_enum_from_text (value);
+ priv->interactive = pk_hint_enum_from_string (value);
if (priv->interactive == PK_HINT_ENUM_INVALID) {
priv->interactive = PK_HINT_ENUM_UNSET;
*error = g_error_new (PK_TRANSACTION_ERROR, PK_TRANSACTION_ERROR_NOT_SUPPORTED,
@@ -4624,7 +4624,7 @@ pk_transaction_simulate_install_files (PkTransaction *transaction, gchar **full_
g_return_if_fail (PK_IS_TRANSACTION (transaction));
g_return_if_fail (transaction->priv->tid != NULL);
- full_paths_temp = pk_package_ids_to_text (full_paths);
+ full_paths_temp = pk_package_ids_to_string (full_paths);
egg_debug ("SimulateInstallFiles method called: %s", full_paths_temp);
g_free (full_paths_temp);
@@ -4762,7 +4762,7 @@ pk_transaction_simulate_install_packages (PkTransaction *transaction, gchar **pa
/* check package_ids */
ret = pk_package_ids_check (package_ids);
if (!ret) {
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
error = g_error_new (PK_TRANSACTION_ERROR, PK_TRANSACTION_ERROR_PACKAGE_ID_INVALID,
"The package id's '%s' are not valid", package_ids_temp);
g_free (package_ids_temp);
@@ -4838,7 +4838,7 @@ pk_transaction_simulate_remove_packages (PkTransaction *transaction, gchar **pac
/* check package_ids */
ret = pk_package_ids_check (package_ids);
if (!ret) {
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
error = g_error_new (PK_TRANSACTION_ERROR, PK_TRANSACTION_ERROR_PACKAGE_ID_INVALID,
"The package id's '%s' are not valid", package_ids_temp);
g_free (package_ids_temp);
@@ -4914,7 +4914,7 @@ pk_transaction_simulate_update_packages (PkTransaction *transaction, gchar **pac
/* check package_ids */
ret = pk_package_ids_check (package_ids);
if (!ret) {
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
error = g_error_new (PK_TRANSACTION_ERROR, PK_TRANSACTION_ERROR_PACKAGE_ID_INVALID,
"The package id's '%s' are not valid", package_ids_temp);
g_free (package_ids_temp);
@@ -4956,7 +4956,7 @@ pk_transaction_update_packages (PkTransaction *transaction, gboolean only_truste
g_return_if_fail (PK_IS_TRANSACTION (transaction));
g_return_if_fail (transaction->priv->tid != NULL);
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
egg_debug ("UpdatePackages method called: %s", package_ids_temp);
g_free (package_ids_temp);
@@ -4991,7 +4991,7 @@ pk_transaction_update_packages (PkTransaction *transaction, gboolean only_truste
/* check package_ids */
ret = pk_package_ids_check (package_ids);
if (!ret) {
- package_ids_temp = pk_package_ids_to_text (package_ids);
+ package_ids_temp = pk_package_ids_to_string (package_ids);
error = g_error_new (PK_TRANSACTION_ERROR, PK_TRANSACTION_ERROR_PACKAGE_ID_INVALID,
"The package id's '%s' are not valid", package_ids_temp);
g_free (package_ids_temp);
@@ -5122,7 +5122,7 @@ pk_transaction_what_provides (PkTransaction *transaction, const gchar *filter, c
}
/* check provides */
- provides = pk_provides_enum_from_text (type);
+ provides = pk_provides_enum_from_string (type);
if (provides == PK_PROVIDES_ENUM_UNKNOWN) {
error = g_error_new (PK_TRANSACTION_ERROR, PK_TRANSACTION_ERROR_INVALID_PROVIDE,
"provide type '%s' not found", type);
@@ -5132,7 +5132,7 @@ pk_transaction_what_provides (PkTransaction *transaction, const gchar *filter, c
}
/* save so we can run later */
- transaction->priv->cached_filters = pk_filter_bitfield_from_text (filter);
+ transaction->priv->cached_filters = pk_filter_bitfield_from_string (filter);
transaction->priv->cached_values = g_strdupv (values);
transaction->priv->cached_provides = provides;
pk_transaction_set_role (transaction, PK_ROLE_ENUM_WHAT_PROVIDES);
@@ -5163,10 +5163,10 @@ pk_transaction_get_property (GObject *object, guint prop_id, GValue *value, GPar
switch (prop_id) {
case PROP_ROLE:
- g_value_set_string (value, pk_role_enum_to_text (transaction->priv->role));
+ g_value_set_string (value, pk_role_enum_to_string (transaction->priv->role));
break;
case PROP_STATUS:
- g_value_set_string (value, pk_status_enum_to_text (transaction->priv->status));
+ g_value_set_string (value, pk_status_enum_to_string (transaction->priv->status));
break;
case PROP_LAST_PACKAGE:
g_value_set_string (value, transaction->priv->last_package_id);
commit 5879cb55b16ae3f67b5908dd1a5558fcaf887b2e
Merge: df73a39... 08d1917...
Author: Daniel Nicoletti <dantti85-pk at yahoo.com.br>
Date: Mon Jan 11 13:19:50 2010 -0200
Merge branch 'master' of git+ssh://git.packagekit.org/srv/git/PackageKit
commit df73a39e466d273fb95a5a428503e7f45dc97e5f
Author: Daniel Nicoletti <dantti85-pk at yahoo.com.br>
Date: Mon Jan 11 12:12:49 2010 -0200
aptcc: impoved search file
diff --git a/backends/aptcc/apt.cpp b/backends/aptcc/apt.cpp
index 82ffbd3..3d89838 100644
--- a/backends/aptcc/apt.cpp
+++ b/backends/aptcc/apt.cpp
@@ -652,8 +652,12 @@ vector<string> search_files (PkBackend *backend, gchar **values, bool &_cancel)
vector<string> packageList;
regex_t re;
gchar *search;
+ gchar *values_str;
- search = g_strjoinv("|", values);
+ values_str = g_strjoinv("$|^", values);
+ search = g_strdup_printf("^%s$",
+ values_str);
+ g_free(values_str);
if(regcomp(&re, search, REG_NOSUB) != 0) {
egg_debug("Regex compilation error");
g_free(search);
commit 08d19175bb9f809294325578593fe42e5e0bbb24
Author: Richard Hughes <richard at hughsie.com>
Date: Sun Jan 10 12:04:17 2010 +0000
Add sync versions of the PkPackageSack functions
diff --git a/lib/packagekit-glib2/Makefile.am b/lib/packagekit-glib2/Makefile.am
index 63a1412..35d7688 100644
--- a/lib/packagekit-glib2/Makefile.am
+++ b/lib/packagekit-glib2/Makefile.am
@@ -48,6 +48,7 @@ libpackagekit_glib2_include_HEADERS = \
pk-package-id.h \
pk-package-ids.h \
pk-package-sack.h \
+ pk-package-sack-sync.h \
pk-progress.h \
pk-repo-detail.h \
pk-repo-signature-required.h \
@@ -112,6 +113,8 @@ libpackagekit_glib2_la_SOURCES = \
pk-package-ids.h \
pk-package-sack.c \
pk-package-sack.h \
+ pk-package-sack-sync.c \
+ pk-package-sack-sync.h \
pk-progress.c \
pk-progress.h \
pk-repo-detail.c \
diff --git a/lib/packagekit-glib2/packagekit.h b/lib/packagekit-glib2/packagekit.h
index 2d9da27..4d6cf66 100644
--- a/lib/packagekit-glib2/packagekit.h
+++ b/lib/packagekit-glib2/packagekit.h
@@ -48,6 +48,7 @@
#include <packagekit-glib2/pk-package-id.h>
#include <packagekit-glib2/pk-package-ids.h>
#include <packagekit-glib2/pk-package-sack.h>
+#include <packagekit-glib2/pk-package-sack-sync.h>
#include <packagekit-glib2/pk-progress.h>
#include <packagekit-glib2/pk-repo-detail.h>
#include <packagekit-glib2/pk-repo-signature-required.h>
diff --git a/lib/packagekit-glib2/pk-package-sack-sync.c b/lib/packagekit-glib2/pk-package-sack-sync.c
new file mode 100644
index 0000000..17bc616
--- /dev/null
+++ b/lib/packagekit-glib2/pk-package-sack-sync.c
@@ -0,0 +1,168 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2008-2009 Richard Hughes <richard at hughsie.com>
+ *
+ * Licensed under the GNU General Public License Version 2
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "config.h"
+
+#include <stdio.h>
+#include <gio/gio.h>
+#include <glib.h>
+#include <packagekit-glib2/pk-results.h>
+#include <packagekit-glib2/pk-package-sack.h>
+
+#include "egg-debug.h"
+
+#include "pk-package-sack-sync.h"
+
+/* tiny helper to help us do the async operation */
+typedef struct {
+ GError **error;
+ GMainLoop *loop;
+ gboolean ret;
+} PkPackageSackHelper;
+
+/**
+ * pk_package_sack_generic_cb:
+ **/
+static void
+pk_package_sack_generic_cb (PkPackageSack *package_sack, GAsyncResult *res, PkPackageSackHelper *helper)
+{
+ /* get the result */
+ helper->ret = pk_package_sack_merge_generic_finish (package_sack, res, helper->error);
+ g_main_loop_quit (helper->loop);
+}
+
+/**
+ * pk_package_sack_resolve:
+ * @package_sack: a valid #PkPackageSack instance
+ * @cancellable: a #GCancellable or %NULL
+ * @error: A #GError or %NULL
+ *
+ * Gets the properties the daemon supports.
+ * Warning: this function is synchronous, and may block. Do not use it in GUI
+ * applications.
+ *
+ * Return value: %TRUE if the properties were set correctly
+ **/
+gboolean
+pk_package_sack_resolve (PkPackageSack *package_sack, GCancellable *cancellable, GError **error)
+{
+ gboolean ret;
+ PkPackageSackHelper *helper;
+
+ g_return_val_if_fail (PK_IS_PACKAGE_SACK (package_sack), FALSE);
+ g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+ /* create temp object */
+ helper = g_new0 (PkPackageSackHelper, 1);
+ helper->loop = g_main_loop_new (NULL, FALSE);
+ helper->error = error;
+
+ /* run async method */
+ pk_package_sack_resolve_async (package_sack, cancellable, NULL, NULL, (GAsyncReadyCallback) pk_package_sack_generic_cb, helper);
+ g_main_loop_run (helper->loop);
+
+ ret = helper->ret;
+
+ /* free temp object */
+ g_main_loop_unref (helper->loop);
+ g_free (helper);
+
+ return ret;
+}
+
+/**
+ * pk_package_sack_get_details:
+ * @package_sack: a valid #PkPackageSack instance
+ * @cancellable: a #GCancellable or %NULL
+ * @error: A #GError or %NULL
+ *
+ * Gets the properties the daemon supports.
+ * Warning: this function is synchronous, and may block. Do not use it in GUI
+ * applications.
+ *
+ * Return value: %TRUE if the properties were set correctly
+ **/
+gboolean
+pk_package_sack_get_details (PkPackageSack *package_sack, GCancellable *cancellable, GError **error)
+{
+ gboolean ret;
+ PkPackageSackHelper *helper;
+
+ g_return_val_if_fail (PK_IS_PACKAGE_SACK (package_sack), FALSE);
+ g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+ /* create temp object */
+ helper = g_new0 (PkPackageSackHelper, 1);
+ helper->loop = g_main_loop_new (NULL, FALSE);
+ helper->error = error;
+
+ /* run async method */
+ pk_package_sack_get_details_async (package_sack, cancellable, NULL, NULL, (GAsyncReadyCallback) pk_package_sack_generic_cb, helper);
+ g_main_loop_run (helper->loop);
+
+ ret = helper->ret;
+
+ /* free temp object */
+ g_main_loop_unref (helper->loop);
+ g_free (helper);
+
+ return ret;
+}
+
+/**
+ * pk_package_sack_get_update_detail:
+ * @package_sack: a valid #PkPackageSack instance
+ * @cancellable: a #GCancellable or %NULL
+ * @error: A #GError or %NULL
+ *
+ * Gets the properties the daemon supports.
+ * Warning: this function is synchronous, and may block. Do not use it in GUI
+ * applications.
+ *
+ * Return value: %TRUE if the properties were set correctly
+ **/
+gboolean
+pk_package_sack_get_update_detail (PkPackageSack *package_sack, GCancellable *cancellable, GError **error)
+{
+ gboolean ret;
+ PkPackageSackHelper *helper;
+
+ g_return_val_if_fail (PK_IS_PACKAGE_SACK (package_sack), FALSE);
+ g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
+
+ /* create temp object */
+ helper = g_new0 (PkPackageSackHelper, 1);
+ helper->loop = g_main_loop_new (NULL, FALSE);
+ helper->error = error;
+
+ /* run async method */
+ pk_package_sack_get_update_detail_async (package_sack, cancellable, NULL, NULL, (GAsyncReadyCallback) pk_package_sack_generic_cb, helper);
+ g_main_loop_run (helper->loop);
+
+ ret = helper->ret;
+
+ /* free temp object */
+ g_main_loop_unref (helper->loop);
+ g_free (helper);
+
+ return ret;
+}
+
diff --git a/lib/packagekit-glib2/pk-package-sack-sync.h b/lib/packagekit-glib2/pk-package-sack-sync.h
new file mode 100644
index 0000000..802f54c
--- /dev/null
+++ b/lib/packagekit-glib2/pk-package-sack-sync.h
@@ -0,0 +1,41 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2009 Richard Hughes <richard at hughsie.com>
+ *
+ * Licensed under the GNU General Public License Version 2
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __PK_PACKAGE_SACK_SYNC_H
+#define __PK_PACKAGE_SACK_SYNC_H
+
+#include <glib.h>
+#include <packagekit-glib2/pk-package-sack.h>
+
+gboolean pk_package_sack_resolve (PkPackageSack *package_sack,
+ GCancellable *cancellable,
+ GError **error);
+gboolean pk_package_sack_get_details (PkPackageSack *package_sack,
+ GCancellable *cancellable,
+ GError **error);
+gboolean pk_package_sack_get_update_detail (PkPackageSack *package_sack,
+ GCancellable *cancellable,
+ GError **error);
+
+#endif /* __PK_PACKAGE_SACK_SYNC_H */
+
+
+
commit 7316eee6cfe90959e55896564f2caaac74b26775
Author: Richard Hughes <richard at hughsie.com>
Date: Sun Jan 10 12:03:31 2010 +0000
trivial: rename a couple of functions to be more like the PkClient API
Nothing yet use these new functions, so the API break is okay.
diff --git a/lib/packagekit-glib2/pk-package-sack.c b/lib/packagekit-glib2/pk-package-sack.c
index c26147f..83dc4c7 100644
--- a/lib/packagekit-glib2/pk-package-sack.c
+++ b/lib/packagekit-glib2/pk-package-sack.c
@@ -472,10 +472,10 @@ pk_package_sack_merge_bool_state_finish (PkPackageSackState *state, const GError
}
/**
- * pk_package_sack_merge_resolve_cb:
+ * pk_package_sack_resolve_cb:
**/
static void
-pk_package_sack_merge_resolve_cb (GObject *source_object, GAsyncResult *res, PkPackageSackState *state)
+pk_package_sack_resolve_cb (GObject *source_object, GAsyncResult *res, PkPackageSackState *state)
{
PkClient *client = PK_CLIENT (source_object);
GError *error = NULL;
@@ -547,7 +547,7 @@ out:
}
/**
- * pk_package_sack_merge_resolve_async:
+ * pk_package_sack_resolve_async:
* @sack: a valid #PkPackageSack instance
* @cancellable: a #GCancellable or %NULL
* @progress_callback: the function to run when the progress changes
@@ -558,7 +558,7 @@ out:
* Merges in details about packages using resolve.
**/
void
-pk_package_sack_merge_resolve_async (PkPackageSack *sack, GCancellable *cancellable,
+pk_package_sack_resolve_async (PkPackageSack *sack, GCancellable *cancellable,
PkProgressCallback progress_callback, gpointer progress_user_data,
GAsyncReadyCallback callback, gpointer user_data)
{
@@ -569,7 +569,7 @@ pk_package_sack_merge_resolve_async (PkPackageSack *sack, GCancellable *cancella
g_return_if_fail (PK_IS_PACKAGE_SACK (sack));
g_return_if_fail (callback != NULL);
- res = g_simple_async_result_new (G_OBJECT (sack), callback, user_data, pk_package_sack_merge_resolve_async);
+ res = g_simple_async_result_new (G_OBJECT (sack), callback, user_data, pk_package_sack_resolve_async);
/* save state */
state = g_slice_new0 (PkPackageSackState);
@@ -584,7 +584,7 @@ pk_package_sack_merge_resolve_async (PkPackageSack *sack, GCancellable *cancella
package_ids = pk_package_sack_get_package_ids (sack);
pk_client_resolve_async (sack->priv->client, pk_bitfield_value (PK_FILTER_ENUM_INSTALLED), package_ids,
cancellable, progress_callback, progress_user_data,
- (GAsyncReadyCallback) pk_package_sack_merge_resolve_cb, state);
+ (GAsyncReadyCallback) pk_package_sack_resolve_cb, state);
g_strfreev (package_ids);
g_object_unref (res);
}
@@ -619,10 +619,10 @@ pk_package_sack_merge_generic_finish (PkPackageSack *sack, GAsyncResult *res, GE
/***************************************************************************************************/
/**
- * pk_package_sack_merge_details_cb:
+ * pk_package_sack_get_details_cb:
**/
static void
-pk_package_sack_merge_details_cb (GObject *source_object, GAsyncResult *res, PkPackageSackState *state)
+pk_package_sack_get_details_cb (GObject *source_object, GAsyncResult *res, PkPackageSackState *state)
{
PkClient *client = PK_CLIENT (source_object);
GError *error = NULL;
@@ -705,7 +705,7 @@ out:
}
/**
- * pk_package_sack_merge_details_async:
+ * pk_package_sack_get_details_async:
* @sack: a valid #PkPackageSack instance
* @cancellable: a #GCancellable or %NULL
* @progress_callback: the function to run when the progress changes
@@ -716,9 +716,9 @@ out:
* Merges in details about packages.
**/
void
-pk_package_sack_merge_details_async (PkPackageSack *sack, GCancellable *cancellable,
- PkProgressCallback progress_callback, gpointer progress_user_data,
- GAsyncReadyCallback callback, gpointer user_data)
+pk_package_sack_get_details_async (PkPackageSack *sack, GCancellable *cancellable,
+ PkProgressCallback progress_callback, gpointer progress_user_data,
+ GAsyncReadyCallback callback, gpointer user_data)
{
GSimpleAsyncResult *res;
PkPackageSackState *state;
@@ -727,7 +727,7 @@ pk_package_sack_merge_details_async (PkPackageSack *sack, GCancellable *cancella
g_return_if_fail (PK_IS_PACKAGE_SACK (sack));
g_return_if_fail (callback != NULL);
- res = g_simple_async_result_new (G_OBJECT (sack), callback, user_data, pk_package_sack_merge_details_async);
+ res = g_simple_async_result_new (G_OBJECT (sack), callback, user_data, pk_package_sack_get_details_async);
/* save state */
state = g_slice_new0 (PkPackageSackState);
@@ -742,7 +742,7 @@ pk_package_sack_merge_details_async (PkPackageSack *sack, GCancellable *cancella
package_ids = pk_package_sack_get_package_ids (sack);
pk_client_get_details_async (sack->priv->client, package_ids,
cancellable, progress_callback, progress_user_data,
- (GAsyncReadyCallback) pk_package_sack_merge_details_cb, state);
+ (GAsyncReadyCallback) pk_package_sack_get_details_cb, state);
g_strfreev (package_ids);
g_object_unref (res);
@@ -751,10 +751,10 @@ pk_package_sack_merge_details_async (PkPackageSack *sack, GCancellable *cancella
/***************************************************************************************************/
/**
- * pk_package_sack_merge_update_detail_cb:
+ * pk_package_sack_get_update_detail_cb:
**/
static void
-pk_package_sack_merge_update_detail_cb (GObject *source_object, GAsyncResult *res, PkPackageSackState *state)
+pk_package_sack_get_update_detail_cb (GObject *source_object, GAsyncResult *res, PkPackageSackState *state)
{
PkClient *client = PK_CLIENT (source_object);
GError *error = NULL;
@@ -860,7 +860,7 @@ out:
}
/**
- * pk_package_sack_merge_update_detail_async:
+ * pk_package_sack_get_update_detail_async:
* @sack: a valid #PkPackageSack instance
* @cancellable: a #GCancellable or %NULL
* @progress_callback: the function to run when the progress changes
@@ -871,9 +871,9 @@ out:
* Merges in update details about packages.
**/
void
-pk_package_sack_merge_update_detail_async (PkPackageSack *sack, GCancellable *cancellable,
- PkProgressCallback progress_callback, gpointer progress_user_data,
- GAsyncReadyCallback callback, gpointer user_data)
+pk_package_sack_get_update_detail_async (PkPackageSack *sack, GCancellable *cancellable,
+ PkProgressCallback progress_callback, gpointer progress_user_data,
+ GAsyncReadyCallback callback, gpointer user_data)
{
GSimpleAsyncResult *res;
PkPackageSackState *state;
@@ -882,7 +882,7 @@ pk_package_sack_merge_update_detail_async (PkPackageSack *sack, GCancellable *ca
g_return_if_fail (PK_IS_PACKAGE_SACK (sack));
g_return_if_fail (callback != NULL);
- res = g_simple_async_result_new (G_OBJECT (sack), callback, user_data, pk_package_sack_merge_update_detail_async);
+ res = g_simple_async_result_new (G_OBJECT (sack), callback, user_data, pk_package_sack_get_update_detail_async);
/* save state */
state = g_slice_new0 (PkPackageSackState);
@@ -897,7 +897,7 @@ pk_package_sack_merge_update_detail_async (PkPackageSack *sack, GCancellable *ca
package_ids = pk_package_sack_get_package_ids (sack);
pk_client_get_update_detail_async (sack->priv->client, package_ids,
cancellable, progress_callback, progress_user_data,
- (GAsyncReadyCallback) pk_package_sack_merge_update_detail_cb, state);
+ (GAsyncReadyCallback) pk_package_sack_get_update_detail_cb, state);
g_strfreev (package_ids);
g_object_unref (res);
@@ -1081,7 +1081,7 @@ pk_package_sack_test (gpointer user_data)
/************************************************************/
egg_test_title (test, "merge resolve results");
- pk_package_sack_merge_resolve_async (sack, NULL, NULL, NULL, (GAsyncReadyCallback) pk_package_sack_test_resolve_cb, test);
+ pk_package_sack_resolve_async (sack, NULL, NULL, NULL, (GAsyncReadyCallback) pk_package_sack_test_resolve_cb, test);
egg_test_loop_wait (test, 5000);
egg_test_success (test, "resolved in %i", egg_test_elapsed (test));
@@ -1107,7 +1107,7 @@ pk_package_sack_test (gpointer user_data)
/************************************************************/
egg_test_title (test, "merge details results");
- pk_package_sack_merge_details_async (sack, NULL, NULL, NULL, (GAsyncReadyCallback) pk_package_sack_test_details_cb, test);
+ pk_package_sack_get_details_async (sack, NULL, NULL, NULL, (GAsyncReadyCallback) pk_package_sack_test_details_cb, test);
egg_test_loop_wait (test, 5000);
egg_test_success (test, "got details in %i", egg_test_elapsed (test));
@@ -1127,7 +1127,7 @@ pk_package_sack_test (gpointer user_data)
/************************************************************/
egg_test_title (test, "merge update detail results");
- pk_package_sack_merge_update_detail_async (sack, NULL, NULL, NULL, (GAsyncReadyCallback) pk_package_sack_test_update_detail_cb, test);
+ pk_package_sack_get_update_detail_async (sack, NULL, NULL, NULL, (GAsyncReadyCallback) pk_package_sack_test_update_detail_cb, test);
egg_test_loop_wait (test, 5000);
egg_test_success (test, "got update detail in %i", egg_test_elapsed (test));
diff --git a/lib/packagekit-glib2/pk-package-sack.h b/lib/packagekit-glib2/pk-package-sack.h
index 7303788..06b7c7f 100644
--- a/lib/packagekit-glib2/pk-package-sack.h
+++ b/lib/packagekit-glib2/pk-package-sack.h
@@ -99,7 +99,7 @@ gboolean pk_package_sack_merge_generic_finish (PkPackageSack *sack,
GError **error);
/* merging in data to the array using Resolve() */
-void pk_package_sack_merge_resolve_async (PkPackageSack *sack,
+void pk_package_sack_resolve_async (PkPackageSack *sack,
GCancellable *cancellable,
PkProgressCallback progress_callback,
gpointer progress_user_data,
@@ -107,7 +107,7 @@ void pk_package_sack_merge_resolve_async (PkPackageSack *sack,
gpointer user_data);
/* merging in data to the array using Details() */
-void pk_package_sack_merge_details_async (PkPackageSack *sack,
+void pk_package_sack_get_details_async (PkPackageSack *sack,
GCancellable *cancellable,
PkProgressCallback progress_callback,
gpointer progress_user_data,
@@ -115,7 +115,7 @@ void pk_package_sack_merge_details_async (PkPackageSack *sack,
gpointer user_data);
/* merging in data to the array using UpdateDetail() */
-void pk_package_sack_merge_update_detail_async (PkPackageSack *sack,
+void pk_package_sack_get_update_detail_async (PkPackageSack *sack,
GCancellable *cancellable,
PkProgressCallback progress_callback,
gpointer progress_user_data,
commit ee394e8c505a7cd56fdd7fa4749df2217b4c1a2c
Author: Richard Hughes <richard at hughsie.com>
Date: Sun Jan 10 12:02:29 2010 +0000
trivial: add a self check to ensure that PK_INFO_ENUM_FINISHED packages cannot be added
diff --git a/lib/packagekit-glib2/pk-results.c b/lib/packagekit-glib2/pk-results.c
index 85848a6..4c9a5ef 100644
--- a/lib/packagekit-glib2/pk-results.c
+++ b/lib/packagekit-glib2/pk-results.c
@@ -163,9 +163,20 @@ pk_results_set_exit_code (PkResults *results, PkExitEnum exit_enum)
gboolean
pk_results_add_package (PkResults *results, PkPackage *item)
{
+ PkInfoEnum info;
+
g_return_val_if_fail (PK_IS_RESULTS (results), FALSE);
g_return_val_if_fail (item != NULL, FALSE);
+ /* do not allow finished types */
+ g_object_get (item,
+ "info", &info,
+ NULL);
+ if (info == PK_INFO_ENUM_FINISHED) {
+ egg_warning ("internal error: finished packages cannot be added to a PkResults object");
+ return FALSE;
+ }
+
/* copy and add to array */
g_ptr_array_add (results->priv->package_array, g_object_ref (item));
commit 45d66375e4328d68c6d3aabd643e21069495a2cb
Author: gml520 <gml520 at fedoraproject.org>
Date: Sat Jan 9 11:56:58 2010 +0000
Sending translation for Chinese (Simplified)
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6bb8e61..a4307b3 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,387 +8,2146 @@ msgid ""
msgstr ""
"Project-Id-Version: pavucontrol.master-tx\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-07 20:10+0000\n"
-"PO-Revision-Date: 2009-12-09 11:11+1000\n"
-"Last-Translator: Leah Liu <lliu at redhat.com>\n"
+"POT-Creation-Date: 2009-12-30 10:34+0000\n"
+"PO-Revision-Date: 2010-01-09 19:54+0800\n"
+"Last-Translator: 官明霖 <guanminglin at gmail.com>\n"
"Language-Team: Simplified Chinese <zh at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../src/pavucontrol.desktop.in.h:1
-msgid "Adjust the volume level"
-msgstr "调节音é‡æ°´å¹³"
+#. TRANSLATORS: this is an atomic transaction
+#. TRANSLATORS: the role is the point of the transaction, e.g. update-system
+#: ../client/pk-console.c:175
+#: ../client/pk-console.c:597
+msgid "Transaction"
+msgstr "处ç†"
+
+#. TRANSLATORS: this is the time the transaction was started in system timezone
+#: ../client/pk-console.c:177
+msgid "System time"
+msgstr "系统时间"
+
+#. TRANSLATORS: this is if the transaction succeeded or not
+#: ../client/pk-console.c:179
+msgid "Succeeded"
+msgstr "æˆåŠŸ"
+
+#: ../client/pk-console.c:179
+msgid "True"
+msgstr "æ£ç¡®"
+
+#: ../client/pk-console.c:179
+msgid "False"
+msgstr "错误"
+
+#. TRANSLATORS: this is the transactions role, e.g. "update-system"
+#. TRANSLATORS: the trasaction role, e.g. update-system
+#: ../client/pk-console.c:181
+#: ../src/pk-polkit-action-lookup.c:332
+msgid "Role"
+msgstr "任务"
+
+#. TRANSLATORS: this is The duration of the transaction
+#: ../client/pk-console.c:186
+msgid "Duration"
+msgstr "æŒç»æ—¶é—´"
+
+#: ../client/pk-console.c:186
+msgid "(seconds)"
+msgstr "(秒)"
+
+#. TRANSLATORS: this is The command line used to do the action
+#. TRANSLATORS: the command line of the thing that wants the authentication
+#: ../client/pk-console.c:190
+#: ../src/pk-polkit-action-lookup.c:346
+msgid "Command line"
+msgstr "命令行"
+
+#. TRANSLATORS: this is the user ID of the user that started the action
+#: ../client/pk-console.c:192
+msgid "User ID"
+msgstr "用户ID"
+
+#. TRANSLATORS: this is the username, e.g. hughsie
+#: ../client/pk-console.c:199
+msgid "Username"
+msgstr "用户å"
+
+#. TRANSLATORS: this is the users real name, e.g. "Richard Hughes"
+#: ../client/pk-console.c:203
+msgid "Real name"
+msgstr "真实姓å"
+
+#: ../client/pk-console.c:211
+msgid "Affected packages:"
+msgstr "å—å½±å“的包"
+
+#: ../client/pk-console.c:213
+msgid "Affected packages: None"
+msgstr "å—å½±å“çš„åŒ…ï¼šæ— "
+
+#. TRANSLATORS: this is the distro, e.g. Fedora 10
+#: ../client/pk-console.c:248
+msgid "Distribution"
+msgstr "分é…"
+
+#. TRANSLATORS: this is type of update, stable or testing
+#: ../client/pk-console.c:250
+msgid "Type"
+msgstr "类型"
+
+#. TRANSLATORS: this is any summary text describing the upgrade
+#. TRANSLATORS: this is the summary of the group
+#: ../client/pk-console.c:252
+#: ../client/pk-console.c:291
+msgid "Summary"
+msgstr "摘è¦"
+
+#. TRANSLATORS: this is the group category name
+#: ../client/pk-console.c:280
+msgid "Category"
+msgstr "类别"
+
+#. TRANSLATORS: this is group identifier
+#: ../client/pk-console.c:282
+msgid "ID"
+msgstr "ID"
+
+#. TRANSLATORS: this is the parent group
+#: ../client/pk-console.c:285
+msgid "Parent"
+msgstr "相对的"
+
+#. TRANSLATORS: this is the name of the parent group
+#: ../client/pk-console.c:288
+msgid "Name"
+msgstr "å称"
+
+#. TRANSLATORS: this is preferred icon for the group
+#: ../client/pk-console.c:294
+msgid "Icon"
+msgstr "å›¾æ ‡"
+
+#. TRANSLATORS: this is a header for the package that can be updated
+#: ../client/pk-console.c:340
+msgid "Details about the update:"
+msgstr "关于 更新的详细信æ¯"
+
+#. TRANSLATORS: details about the update, package name and version
+#. TRANSLATORS: the package that is being processed
+#. TRANSLATORS: the package that is not signed by a known key
+#. TRANSLATORS: the package name that was trying to be installed
+#. TRANSLATORS: title, the names of the packages that the method is processing
+#: ../client/pk-console.c:346
+#: ../client/pk-console.c:616
+#: ../lib/packagekit-glib2/pk-task-text.c:126
+#: ../lib/packagekit-glib2/pk-task-text.c:208
+#: ../src/pk-polkit-action-lookup.c:357
+msgid "Package"
+msgid_plural "Packages"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANSLATORS: details about the update, any packages that this update updates
+#: ../client/pk-console.c:349
+msgid "Updates"
+msgstr "æ›´æ–°"
+
+#. TRANSLATORS: details about the update, any packages that this update obsoletes
+#: ../client/pk-console.c:353
+msgid "Obsoletes"
+msgstr "陈旧的"
+
+#. TRANSLATORS: details about the update, the vendor URLs
+#. TRANSLATORS: the vendor (e.g. vmware) that is providing the EULA
+#: ../client/pk-console.c:357
+#: ../lib/packagekit-glib2/pk-task-text.c:211
+msgid "Vendor"
+msgstr "Vendor"
+
+#. TRANSLATORS: details about the update, the bugzilla URLs
+#: ../client/pk-console.c:361
+msgid "Bugzilla"
+msgstr "Bugzilla"
+
+#. TRANSLATORS: details about the update, the CVE URLs
+#: ../client/pk-console.c:365
+msgid "CVE"
+msgstr "CVE"
+
+#. TRANSLATORS: details about the update, if the package requires a restart
+#: ../client/pk-console.c:369
+msgid "Restart"
+msgstr "é‡å¯"
+
+#. TRANSLATORS: details about the update, any description of the update
+#: ../client/pk-console.c:373
+msgid "Update text"
+msgstr "å‡çº§æè¿°"
+
+#. TRANSLATORS: details about the update, the changelog for the package
+#: ../client/pk-console.c:377
+msgid "Changes"
+msgstr "更改"
+
+#. TRANSLATORS: details about the update, the ongoing state of the update
+#: ../client/pk-console.c:381
+msgid "State"
+msgstr "状æ€"
+
+#. TRANSLATORS: details about the update, date the update was issued
+#: ../client/pk-console.c:385
+msgid "Issued"
+msgstr "Issued"
+
+#. TRANSLATORS: details about the update, date the update was updated
+#. TRANSLATORS: The action of the package, in past tense
+#: ../client/pk-console.c:389
+#: ../lib/packagekit-glib2/pk-console-shared.c:510
+msgid "Updated"
+msgstr "æ›´æ–°çš„"
+
+#. TRANSLATORS: if the repo is enabled
+#: ../client/pk-console.c:425
+msgid "Enabled"
+msgstr "å¯ç”¨çš„"
+
+#. TRANSLATORS: if the repo is disabled
+#: ../client/pk-console.c:428
+msgid "Disabled"
+msgstr "ç¦ç”¨çš„"
+
+#. TRANSLATORS: a package requires the system to be restarted
+#: ../client/pk-console.c:460
+msgid "System restart required by:"
+msgstr "è¦æ±‚系统é‡å¯ï¼š"
+
+#. TRANSLATORS: a package requires the session to be restarted
+#: ../client/pk-console.c:463
+msgid "Session restart required:"
+msgstr "è¦æ±‚会è¯é‡å¯ï¼š"
+
+#. TRANSLATORS: a package requires the system to be restarted due to a security update
+#: ../client/pk-console.c:466
+msgid "System restart (security) required by:"
+msgstr "è¦æ±‚(安全)çš„é‡å¯ç³»ç»Ÿï¼š"
+
+#. TRANSLATORS: a package requires the session to be restarted due to a security update
+#: ../client/pk-console.c:469
+msgid "Session restart (security) required:"
+msgstr "è¦æ±‚会è¯(安全)çš„é‡å¯"
+
+#. TRANSLATORS: a package requires the application to be restarted
+#: ../client/pk-console.c:472
+msgid "Application restart required by:"
+msgstr "è¦æ±‚应用程åºé‡æ–°å¯åŠ¨ï¼š"
+
+#. TRANSLATORS: This a list of details about the package
+#: ../client/pk-console.c:507
+msgid "Package description"
+msgstr "包æè¿°"
+
+#. TRANSLATORS: This a message (like a little note that may be of interest) from the transaction
+#: ../client/pk-console.c:538
+msgid "Message:"
+msgstr "消æ¯ï¼š"
+
+#. TRANSLATORS: This where the package has no files
+#: ../client/pk-console.c:559
+msgid "No files"
+msgstr "没有文件"
+
+#. TRANSLATORS: This a list files contained in the package
+#: ../client/pk-console.c:564
+msgid "Package files"
+msgstr "包文件"
+
+#. TRANSLATORS: the percentage complete of the transaction
+#: ../client/pk-console.c:632
+msgid "Percentage"
+msgstr "百分比"
+
+#. TRANSLATORS: the status of the transaction (e.g. downloading)
+#: ../client/pk-console.c:650
+msgid "Status"
+msgstr "状æ€"
+
+#. TRANSLATORS: the results from the transaction
+#: ../client/pk-console.c:678
+msgid "Results:"
+msgstr "结果："
+
+#. TRANSLATORS: we failed to get any results, which is pretty fatal in my book
+#: ../client/pk-console.c:685
+msgid "Fatal error"
+msgstr "致命的错误"
+
+#. TRANSLATORS: the transaction failed in a way we could not expect
+#: ../client/pk-console.c:694
+#: ../contrib/command-not-found/pk-command-not-found.c:432
+#: ../contrib/command-not-found/pk-command-not-found.c:603
+msgid "The transaction failed"
+msgstr "处ç†å¤±è´¥"
+
+#. TRANSLATORS: print a message when there are no updates
+#: ../client/pk-console.c:721
+msgid "There are no updates available at this time."
+msgstr "当å‰æ²¡æœ‰å¯ç”¨çš„æ›´æ–°"
+
+#. TRANSLATORS: a package needs to restart their system
+#: ../client/pk-console.c:808
+msgid "Please restart the computer to complete the update."
+msgstr "请é‡å¯ç³»ç»Ÿä»¥å®Œæˆæ›´æ–°"
+
+#. TRANSLATORS: a package needs to restart the session
+#: ../client/pk-console.c:811
+msgid "Please logout and login to complete the update."
+msgstr "请é‡æ–°ç™»å½•ä»¥å®Œæˆæ›´æ–°"
+
+#. TRANSLATORS: a package needs to restart their system (due to security)
+#: ../client/pk-console.c:814
+msgid "Please restart the computer to complete the update as important security updates have been installed."
+msgstr "请é‡å¯ç³»ç»Ÿä¸€å®Œæˆç³»ç»Ÿé‡è¦çš„安全更新"
+
+#. TRANSLATORS: a package needs to restart the session (due to security)
+#: ../client/pk-console.c:817
+msgid "Please logout and login to complete the update as important security updates have been installed."
+msgstr "请é‡æ–°ç™»å½•ä»¥å®Œæˆé‡è¦çš„安全更新"
+
+#. TRANSLATORS: There was an error getting the list of files for the package. The detailed error follows
+#: ../client/pk-console.c:840
+#, c-format
+msgid "This tool could not find any available package: %s"
+msgstr "未能找到å¯ç”¨çš„的软件包: %s"
-#: ../src/pavucontrol.desktop.in.h:2 ../src/pavucontrol.cc:476
-msgid "PulseAudio Volume Control"
-msgstr "PulseAudio 音é‡æŽ§åˆ¶"
+#. TRANSLATORS: There was an error getting the list of files for the package. The detailed error follows
+#: ../client/pk-console.c:868
+#, c-format
+msgid "This tool could not find the installed package: %s"
+msgstr "未能找到已安装的软件包:%s"
-#: ../src/pavucontrol.desktop.in.h:3 ../src/pavucontrol.glade.h:32
-msgid "Volume Control"
-msgstr "音é‡æŽ§åˆ¶"
+#. TRANSLATORS: There was an error getting the list of files for the package. The detailed error follows
+#: ../client/pk-console.c:896
+#: ../client/pk-console.c:924
+#, c-format
+msgid "This tool could not find the package: %s"
+msgstr "未能找到软件包: %s"
+
+#. TRANSLATORS: There was an error getting the list of files for the package. The detailed error follows
+#. TRANSLATORS: There was an error getting the dependencies for the package. The detailed error follows
+#. TRANSLATORS: There was an error getting the details about the package. The detailed error follows
+#. TRANSLATORS: The package name was not found in any software sources. The detailed error follows
+#: ../client/pk-console.c:952
+#: ../client/pk-console.c:980
+#: ../client/pk-console.c:1008
+#: ../client/pk-console.c:1036
+#: ../client/pk-console.c:1064
+#, c-format
+msgid "This tool could not find all the packages: %s"
+msgstr "未能找到所有的软件包:%s"
+
+#. TRANSLATORS: This is when the daemon crashed, and we are up shit creek without a paddle
+#: ../client/pk-console.c:1093
+msgid "The daemon crashed mid-transaction!"
+msgstr "守护程åºå†å¤„ç†çš„过程ä¸å´©æºƒ"
+
+#. TRANSLATORS: This is the header to the --help menu
+#: ../client/pk-console.c:1127
+msgid "PackageKit Console Interface"
+msgstr "PackageKit 控制接å£"
+
+#. these are commands we can use with pkcon
+#: ../client/pk-console.c:1129
+msgid "Subcommands:"
+msgstr "å命令："
+
+#. TRANSLATORS: we keep a database updated with the time that an action was last executed
+#: ../client/pk-console.c:1208
+msgid "Failed to get the time since this action was last completed"
+msgstr ""
-#: ../src/pavucontrol.glade.h:2
-#, no-c-format
-msgid "50%"
-msgstr "50%"
+#. TRANSLATORS: command line argument, just show the version string
+#: ../client/pk-console.c:1244
+#: ../client/pk-monitor.c:280
+msgid "Show the program version and exit"
+msgstr ""
-#: ../src/pavucontrol.glade.h:3
-msgid "<b>Port:</b>"
-msgstr "<b>端å£ï¼š</b>"
+#. TRANSLATORS: command line argument, use a filter to narrow down results
+#: ../client/pk-console.c:1247
+msgid "Set the filter, e.g. installed"
+msgstr "设置过滤器 已安装过的"
-#: ../src/pavucontrol.glade.h:4
-msgid "<b>Profile:</b>"
-msgstr "<b>侧写：</b>"
+#. TRANSLATORS: command line argument, work asynchronously
+#: ../client/pk-console.c:1250
+msgid "Exit without waiting for actions to complete"
+msgstr ""
-#: ../src/pavucontrol.glade.h:5
-msgid "<b>S_how:</b>"
-msgstr "<b>显示(_h)：</b>"
+#. command line argument, do we ask questions
+#: ../client/pk-console.c:1253
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:527
+msgid "Install the packages without asking for confirmation"
+msgstr ""
-#: ../src/pavucontrol.glade.h:6
-msgid "<b>Sho_w:</b>"
-msgstr "<b>显示(_w)：</b>"
+#. TRANSLATORS: command line argument, this command is not a priority
+#: ../client/pk-console.c:1256
+msgid "Run the command using idle network bandwidth and also using less power"
+msgstr ""
-#: ../src/pavucontrol.glade.h:7
-msgid "<b>_Show:</b>"
-msgstr "<b>显示(_S)：</b>"
+#. TRANSLATORS: command line argument, just output without fancy formatting
+#: ../client/pk-console.c:1259
+msgid "Print to screen a machine readable output, rather than using animated widgets"
+msgstr ""
-#: ../src/pavucontrol.glade.h:8
-msgid "<b>left-front</b>"
-msgstr "<b>å·¦-å‰</b>"
+#. TRANSLATORS: we failed to contact the daemon
+#: ../client/pk-console.c:1281
+msgid "Failed to contact PackageKit"
+msgstr ""
-#: ../src/pavucontrol.glade.h:9
-msgid "<i>No application is currently playing audio.</i>"
-msgstr "<i>没有程åºæ£åœ¨æ’放音频。</i>"
+#. TRANSLATORS: The user specified an incorrect filter
+#: ../client/pk-console.c:1339
+msgid "The filter specified was invalid"
+msgstr ""
-#: ../src/pavucontrol.glade.h:10
-msgid "<i>No application is currently recording audio.</i>"
-msgstr "<i>没有程åºæ£åœ¨å½•éŸ³ã€‚</i>"
+#. TRANSLATORS: a search type can be name, details, file, etc
+#: ../client/pk-console.c:1358
+msgid "A search type is required, e.g. name"
+msgstr ""
-#: ../src/pavucontrol.glade.h:11
-msgid "<i>No cards available for configuration</i>"
-msgstr "<i>没有å¯ç”¨æ¥é…置的声å¡</i>"
+#. TRANSLATORS: the user needs to provide a search term
+#: ../client/pk-console.c:1365
+#: ../client/pk-console.c:1377
+#: ../client/pk-console.c:1389
+#: ../client/pk-console.c:1401
+msgid "A search term is required"
+msgstr ""
-#: ../src/pavucontrol.glade.h:12
-msgid "<i>No input devices available</i>"
-msgstr "<i>没有å¯ç”¨çš„输入设备</i>"
+#. TRANSLATORS: the search type was provided, but invalid
+#: ../client/pk-console.c:1411
+msgid "Invalid search type"
+msgstr ""
-#: ../src/pavucontrol.glade.h:13
-msgid "<i>No output devices available</i>"
-msgstr "<i>没有å¯ç”¨çš„输出设备</i>"
+#. TRANSLATORS: the user did not specify what they wanted to install
+#: ../client/pk-console.c:1417
+msgid "A package name to install is required"
+msgstr ""
-#: ../src/pavucontrol.glade.h:14
-msgid ""
-"All Input Devices\n"
-"All Except Monitors\n"
-"Hardware Input Devices\n"
-"Virtual Input Devices\n"
-"Monitors"
-msgstr ""
-"全部输入设备\n"
-"全部但ä¸åŒ…括监视器\n"
-"硬件输入设备\n"
-"虚拟输入设备\n"
-"监视器"
-
-#: ../src/pavucontrol.glade.h:19
-msgid ""
-"All Output Devices\n"
-"Hardware Output Devices\n"
-"Virtual Output Devices"
+#. TRANSLATORS: the user did not specify what they wanted to install
+#: ../client/pk-console.c:1426
+msgid "A filename to install is required"
msgstr ""
-"全部输出设备\n"
-"硬件输出设备\n"
-"虚拟输出设备"
-#. Applications All streams
-#: ../src/pavucontrol.glade.h:23
-msgid ""
-"All Streams\n"
-"Applications\n"
-"Virtual Streams"
+#. TRANSLATORS: geeky error, 99.9999% of users won't see this
+#: ../client/pk-console.c:1438
+msgid "A type, key_id and package_id are required"
+msgstr ""
+
+#. TRANSLATORS: the user did not specify what they wanted to remove
+#: ../client/pk-console.c:1449
+msgid "A package name to remove is required"
+msgstr ""
+
+#. TRANSLATORS: the user did not specify anything about what to download or where
+#: ../client/pk-console.c:1458
+msgid "A destination directory and the package names to download are required"
+msgstr ""
+
+#. TRANSLATORS: the directory does not exist, so we can't continue
+#: ../client/pk-console.c:1465
+msgid "Directory not found"
+msgstr "目录未能找到"
+
+#. TRANSLATORS: geeky error, 99.9999% of users won't see this
+#: ../client/pk-console.c:1474
+msgid "A licence identifier (eula-id) is required"
+msgstr ""
+
+#. TRANSLATORS: geeky error, 99.9999% of users won't see this
+#: ../client/pk-console.c:1485
+msgid "A transaction identifier (tid) is required"
+msgstr ""
+
+#. TRANSLATORS: The user did not specify a package name
+#: ../client/pk-console.c:1506
+msgid "A package name to resolve is required"
+msgstr ""
+
+#. TRANSLATORS: The user did not specify a repository (software source) name
+#: ../client/pk-console.c:1517
+#: ../client/pk-console.c:1528
+msgid "A repository name is required"
+msgstr ""
+
+#. TRANSLATORS: The user didn't provide any data
+#: ../client/pk-console.c:1539
+msgid "A repo name, parameter and value are required"
+msgstr ""
+
+#. TRANSLATORS: The user didn't specify what action to use
+#: ../client/pk-console.c:1556
+msgid "An action, e.g. 'update-system' is required"
+msgstr ""
+
+#. TRANSLATORS: The user specified an invalid action
+#: ../client/pk-console.c:1563
+msgid "A correct role is required"
+msgstr ""
+
+#. TRANSLATORS: The user did not provide a package name
+#. TRANSLATORS: This is when the user fails to supply the package name
+#: ../client/pk-console.c:1573
+#: ../client/pk-console.c:1588
+#: ../client/pk-console.c:1597
+#: ../client/pk-console.c:1617
+#: ../client/pk-console.c:1626
+#: ../client/pk-generate-pack.c:298
+msgid "A package name is required"
+msgstr ""
+
+#. TRANSLATORS: each package "provides" certain things, e.g. mime(gstreamer-decoder-mp3), the user didn't specify it
+#: ../client/pk-console.c:1606
+msgid "A package provide string is required"
+msgstr ""
+
+#. TRANSLATORS: The user tried to use an unsupported option on the command line
+#: ../client/pk-console.c:1686
+#, c-format
+msgid "Option '%s' is not supported"
+msgstr ""
+
+#. TRANSLATORS: Generic failure of what they asked to do
+#: ../client/pk-console.c:1696
+msgid "Command failed"
+msgstr "命令失败"
+
+#. TRANSLATORS: we can exclude certain packages (glibc) when we know they'll exist on the target
+#: ../client/pk-generate-pack.c:237
+msgid "Set the file name of dependencies to be excluded"
+msgstr ""
+
+#. TRANSLATORS: the output location
+#: ../client/pk-generate-pack.c:240
+msgid "The output file or directory (the current directory is used if ommitted)"
+msgstr ""
+
+#. TRANSLATORS: put a list of packages in the pack
+#: ../client/pk-generate-pack.c:243
+msgid "The package to be put into the service pack"
+msgstr ""
+
+#. TRANSLATORS: put all pending updates in the pack
+#: ../client/pk-generate-pack.c:246
+msgid "Put all updates available in the service pack"
msgstr ""
-"所有æµåª’体\n"
-"程åº\n"
-"虚拟æµåª’体"
-#: ../src/pavucontrol.glade.h:26
-msgid "Card Name"
-msgstr "声å¡å称"
+#. TRANSLATORS: This is when the user fails to supply the correct arguments
+#: ../client/pk-generate-pack.c:282
+msgid "Neither --package or --updates option selected."
+msgstr ""
-#: ../src/pavucontrol.glade.h:27
-msgid "Device"
-msgstr "设备"
+#. TRANSLATORS: This is when the user fails to supply just one argument
+#: ../client/pk-generate-pack.c:290
+msgid "Both options selected."
+msgstr ""
-#: ../src/pavucontrol.glade.h:28
-msgid "Lock channels together"
-msgstr "é”定声é“"
+#. TRANSLATORS: This is when the user fails to supply the output
+#: ../client/pk-generate-pack.c:306
+msgid "A output directory or file name is required"
+msgstr ""
-#: ../src/pavucontrol.glade.h:29
-msgid "Mute audio"
-msgstr "音频é™éŸ³"
+#. TRANSLATORS: This is when the dameon is not-installed/broken and fails to startup
+#: ../client/pk-generate-pack.c:324
+msgid "The dameon failed to startup"
+msgstr ""
-#: ../src/pavucontrol.glade.h:30
-msgid "Set as fallback"
-msgstr "设定为回放"
+#. TRANSLATORS: This is when the backend doesn't have the capability to get-depends
+#. TRANSLATORS: This is when the backend doesn't have the capability to download
+#: ../client/pk-generate-pack.c:335
+#: ../client/pk-generate-pack.c:341
+msgid "The package manager cannot perform this type of operation."
+msgstr ""
-#: ../src/pavucontrol.glade.h:31
-msgid "Stream Title"
-msgstr "æµåª’ä½“æ ‡é¢˜"
+#. TRANSLATORS: This is when the distro didn't include libarchive support into PK
+#: ../client/pk-generate-pack.c:348
+msgid "Service packs cannot be created as PackageKit was not built with libarchive support."
+msgstr ""
-#: ../src/pavucontrol.glade.h:33
-msgid "_Configuration"
-msgstr "é…置（_C）"
+#. TRANSLATORS: the user specified an absolute path, but didn't get the extension correct
+#: ../client/pk-generate-pack.c:359
+msgid "If specifying a file, the service pack name must end with"
+msgstr ""
-#: ../src/pavucontrol.glade.h:34
-msgid "_Input Devices"
-msgstr "输入设备(_I)"
+#. TRANSLATORS: This is when file already exists
+#: ../client/pk-generate-pack.c:375
+msgid "A pack with the same name already exists, do you want to overwrite it?"
+msgstr ""
-#: ../src/pavucontrol.glade.h:35
-msgid "_Output Devices"
-msgstr "输出设备(_O)"
+#. TRANSLATORS: This is when the pack was not overwritten
+#: ../client/pk-generate-pack.c:378
+msgid "The pack was not overwritten."
+msgstr ""
-#: ../src/pavucontrol.glade.h:36
-msgid "_Playback"
-msgstr "回放(_P)"
+#. TRANSLATORS: This is when the temporary directory cannot be created, the directory name follows
+#: ../client/pk-generate-pack.c:391
+msgid "Failed to create directory:"
+msgstr "创建文件夹失败"
-#: ../src/pavucontrol.glade.h:37
-msgid "_Recording"
-msgstr "录音(_R)"
+#. TRANSLATORS: This is when the list of packages from the remote computer cannot be opened
+#: ../client/pk-generate-pack.c:403
+msgid "Failed to open package list."
+msgstr ""
-#: ../src/pavucontrol.glade.h:38
-msgid "direction"
-msgstr "æ–¹ä½"
+#. TRANSLATORS: The package name is being matched up to available packages
+#: ../client/pk-generate-pack.c:412
+msgid "Finding package name."
+msgstr ""
-#: ../src/pavucontrol.cc:73
-msgid "Card callback failure"
-msgstr "声å¡å›žå«å¤±è´¥"
+#. TRANSLATORS: This is when the package cannot be found in any software source. The detailed error follows
+#: ../client/pk-generate-pack.c:416
+#, c-format
+msgid "Failed to find package '%s': %s"
+msgstr ""
-#: ../src/pavucontrol.cc:92
-msgid "Sink callback failure"
-msgstr "Sink 回å«å¤±è´¥"
+#. TRANSLATORS: This is telling the user we are in the process of making the pack
+#: ../client/pk-generate-pack.c:424
+msgid "Creating service pack..."
+msgstr ""
-#: ../src/pavucontrol.cc:111
-msgid "Source callback failure"
-msgstr "æºå›žå«å¤±è´¥"
+#. TRANSLATORS: we succeeded in making the file
+#: ../client/pk-generate-pack.c:439
+#, c-format
+msgid "Service pack created '%s'"
+msgstr ""
-#: ../src/pavucontrol.cc:130
-msgid "Sink input callback failure"
-msgstr "Sink 输入回å«å¤±è´¥"
+#. TRANSLATORS: we failed to make te file
+#: ../client/pk-generate-pack.c:444
+#, c-format
+msgid "Failed to create '%s': %s"
+msgstr "创建 '%s': %s 失败"
-#: ../src/pavucontrol.cc:149
-msgid "Source output callback failure"
-msgstr "æºè¾“出回å«å¤±è´¥"
+#: ../client/pk-monitor.c:210
+msgid "Failed to get daemon state"
+msgstr "获å–守程åºæŠ¤çŠ¶æ€å¤±è´¥"
-#: ../src/pavucontrol.cc:183
-msgid "Client callback failure"
-msgstr "客户端回å«å¤±è´¥"
+#. TRANSLATORS: this is a program that monitors PackageKit
+#: ../client/pk-monitor.c:296
+msgid "PackageKit Monitor"
+msgstr ""
-#: ../src/pavucontrol.cc:199
-msgid "Server info callback failure"
-msgstr "æœåŠ¡å™¨ä¿¡æ¯å›žå«å¤±è´¥"
+#. TRANSLATORS: when we are getting data from the daemon
+#: ../contrib/browser-plugin/pk-plugin-install.c:495
+msgid "Getting package information..."
+msgstr ""
-#: ../src/pavucontrol.cc:217 ../src/pavucontrol.cc:430
+#. TRANSLATORS: run an applicaiton
+#: ../contrib/browser-plugin/pk-plugin-install.c:501
#, c-format
-msgid "Failed to initialize stream_restore extension: %s"
-msgstr "åˆå§‹åŒ– stream_restore 扩展失败：%s"
+msgid "Run %s"
+msgstr ""
-#: ../src/pavucontrol.cc:235
-msgid "pa_ext_stream_restore_read() failed"
-msgstr "pa_ext_stream_restore_read() 失败"
+#. TRANSLATORS: show the installed version of a package
+#: ../contrib/browser-plugin/pk-plugin-install.c:507
+msgid "Installed version"
+msgstr ""
-#: ../src/pavucontrol.cc:252
-msgid "pa_context_get_sink_info_by_index() failed"
-msgstr "pa_context_get_sink_info_by_index() 失败"
+#. TRANSLATORS: run the application now
+#: ../contrib/browser-plugin/pk-plugin-install.c:515
+#, c-format
+msgid "Run version %s now"
+msgstr ""
-#: ../src/pavucontrol.cc:265
-msgid "pa_context_get_source_info_by_index() failed"
-msgstr "pa_context_get_source_info_by_index() 失败"
+#. TRANSLATORS: run the application now
+#: ../contrib/browser-plugin/pk-plugin-install.c:521
+msgid "Run now"
+msgstr "马上è¿è¡Œ"
-#: ../src/pavucontrol.cc:278 ../src/pavucontrol.cc:291
-msgid "pa_context_get_sink_input_info() failed"
-msgstr "pa_context_get_sink_input_info() 失败"
+#. TRANSLATORS: update to a new version of the package
+#: ../contrib/browser-plugin/pk-plugin-install.c:527
+#, c-format
+msgid "Update to version %s"
+msgstr "更新到 %s"
-#: ../src/pavucontrol.cc:304
-msgid "pa_context_get_client_info() failed"
-msgstr "pa_context_get_client_info() 失败"
+#. TRANSLATORS: To install a package
+#: ../contrib/browser-plugin/pk-plugin-install.c:533
+#, c-format
+msgid "Install %s now"
+msgstr "现在已安装 %s"
-#: ../src/pavucontrol.cc:314 ../src/pavucontrol.cc:371
-msgid "pa_context_get_server_info() failed"
-msgstr "pa_context_get_server_info() 失败"
+#. TRANSLATORS: the version of the package
+#: ../contrib/browser-plugin/pk-plugin-install.c:536
+msgid "Version"
+msgstr "版本"
-#: ../src/pavucontrol.cc:327
-msgid "pa_context_get_card_info_by_index() failed"
-msgstr "pa_context_get_card_info_by_index() 失败"
+#. TRANSLATORS: noting found, so can't install
+#: ../contrib/browser-plugin/pk-plugin-install.c:541
+msgid "No packages found for your system"
+msgstr ""
-#: ../src/pavucontrol.cc:362
-msgid "pa_context_subscribe() failed"
-msgstr "pa_context_subscribe() 失败"
+#. TRANSLATORS: package is being installed
+#: ../contrib/browser-plugin/pk-plugin-install.c:546
+msgid "Installing..."
+msgstr "æ£åœ¨å®‰è£………"
-#: ../src/pavucontrol.cc:378
-msgid "pa_context_client_info_list() failed"
-msgstr "pa_context_client_info_list() 失败"
+#. TRANSLATORS: downloading repo data so we can search
+#: ../contrib/command-not-found/pk-command-not-found.c:365
+msgid "Downloading details about the software sources."
+msgstr ""
-#: ../src/pavucontrol.cc:385
-msgid "pa_context_get_card_info_list() failed"
-msgstr "pa_context_get_card_info_list() 失败"
+#. TRANSLATORS: downloading file lists so we can search
+#: ../contrib/command-not-found/pk-command-not-found.c:369
+msgid "Downloading filelists (this may take some time to complete)."
+msgstr ""
-#: ../src/pavucontrol.cc:392
-msgid "pa_context_get_sink_info_list() failed"
-msgstr "pa_context_get_sink_info_list() 失败"
+#. TRANSLATORS: waiting for native lock
+#: ../contrib/command-not-found/pk-command-not-found.c:373
+msgid "Waiting for package manager lock."
+msgstr ""
-#: ../src/pavucontrol.cc:399
-msgid "pa_context_get_source_info_list() failed"
-msgstr "pa_context_get_source_info_list() 失败"
+#. TRANSLATORS: loading package cache so we can search
+#: ../contrib/command-not-found/pk-command-not-found.c:377
+msgid "Loading list of packages."
+msgstr ""
-#: ../src/pavucontrol.cc:406
-msgid "pa_context_get_sink_input_info_list() failed"
-msgstr "pa_context_get_sink_input_info_list() 失败"
+#. TRANSLATORS: we failed to find the package, this shouldn't happen
+#: ../contrib/command-not-found/pk-command-not-found.c:423
+msgid "Failed to search for file"
+msgstr "æœç´¢æ–‡ä»¶å¤±è´¥"
+
+#. TRANSLATORS: we failed to launch the executable, the error follows
+#: ../contrib/command-not-found/pk-command-not-found.c:566
+msgid "Failed to launch:"
+msgstr "å¯åŠ¨å¤±è´¥ï¼š"
+
+#. TRANSLATORS: we failed to install the package
+#: ../contrib/command-not-found/pk-command-not-found.c:594
+msgid "Failed to install packages"
+msgstr ""
-#: ../src/pavucontrol.cc:413
-msgid "pa_context_get_source_output_info_list() failed"
-msgstr "pa_context_get_source_output_info_list() 失败"
+#. TRANSLATORS: tool that gets called when the command is not found
+#: ../contrib/command-not-found/pk-command-not-found.c:670
+msgid "PackageKit Command Not Found"
+msgstr ""
+
+#. TRANSLATORS: the prefix of all the output telling the user why it's not executing
+#: ../contrib/command-not-found/pk-command-not-found.c:699
+msgid "Command not found."
+msgstr "命令没有找到"
+
+#. TRANSLATORS: tell the user what we think the command is
+#: ../contrib/command-not-found/pk-command-not-found.c:706
+msgid "Similar command is:"
+msgstr ""
+
+#. TRANSLATORS: Ask the user if we should run the similar command
+#: ../contrib/command-not-found/pk-command-not-found.c:716
+msgid "Run similar command:"
+msgstr ""
-#: ../src/pavucontrol.cc:437
-msgid "Connection failed"
-msgstr "连接失败"
+#. TRANSLATORS: show the user a list of commands that they could have meant
+#. TRANSLATORS: show the user a list of commands we could run
+#: ../contrib/command-not-found/pk-command-not-found.c:730
+#: ../contrib/command-not-found/pk-command-not-found.c:739
+msgid "Similar commands are:"
+msgstr ""
-#: ../src/cardwidget.cc:87
-msgid "pa_context_set_card_profile_by_index() failed"
-msgstr "pa_context_set_card_profile_by_index() failed"
+#. TRANSLATORS: ask the user to choose a file to run
+#: ../contrib/command-not-found/pk-command-not-found.c:746
+msgid "Please choose a command to run"
+msgstr ""
-#: ../src/channelwidget.cc:104
-msgid "<small>Silence</small>"
-msgstr "<small>é™éŸ³</small>"
+#. TRANSLATORS: tell the user what package provides the command
+#: ../contrib/command-not-found/pk-command-not-found.c:764
+msgid "The package providing this file is:"
+msgstr ""
-#: ../src/channelwidget.cc:104
-msgid "<small>Min</small>"
-msgstr "<small>最å°</small>"
+#. TRANSLATORS: as the user if we want to install a package to provide the command
+#: ../contrib/command-not-found/pk-command-not-found.c:769
+#, c-format
+msgid "Install package '%s' to provide command '%s'?"
+msgstr ""
-#: ../src/channelwidget.cc:105
-msgid "<small>Max</small>"
-msgstr "<small>最大</small>"
+#. TRANSLATORS: Show the user a list of packages that provide this command
+#: ../contrib/command-not-found/pk-command-not-found.c:793
+msgid "Packages providing this file are:"
+msgstr ""
-#: ../src/channelwidget.cc:109
-msgid "<small><i>Base</i></small>"
-msgstr "<small><i>低音</i></small>"
+#. TRANSLATORS: Show the user a list of packages that they can install to provide this command
+#: ../contrib/command-not-found/pk-command-not-found.c:803
+msgid "Suitable packages are:"
+msgstr ""
-#: ../src/mainwindow.cc:269
-msgid "Failed to read data from stream"
-msgstr "æ— æ³•ä»Žæµåª’体ä¸è¯»å–æ•°æ®"
+#. get selection
+#. TRANSLATORS: ask the user to choose a file to install
+#: ../contrib/command-not-found/pk-command-not-found.c:812
+msgid "Please choose a package to install"
+msgstr ""
-#: ../src/mainwindow.cc:304 ../src/mainwindow.cc:341
-msgid "Peak detect"
-msgstr "尖峰探测"
+#. TRANSLATORS: we are starting to install the packages
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:197
+msgid "Starting install"
+msgstr ""
-#: ../src/mainwindow.cc:305 ../src/mainwindow.cc:342
-msgid "Failed to create monitoring stream"
-msgstr "æ— æ³•å¸¸è§ç›‘视æµåª’体"
+#. TRANSLATORS: we couldn't find the package name, non-fatal
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:409
+#, c-format
+msgid "Failed to find the package %s, or already installed: %s"
+msgstr ""
-#: ../src/mainwindow.cc:313 ../src/mainwindow.cc:351
-msgid "Failed to connect monitoring stream"
-msgstr "æ— æ³•è¿žæŽ¥åˆ°ç›‘è§†æµåª’体"
+#. command line argument, simulate what would be done, but don't actually do it
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:518
+msgid "Don't actually install any packages, only simulate what would be installed"
+msgstr ""
-#: ../src/mainwindow.cc:466
-msgid ""
-"Ignoring sink-input due to it being designated as an event and thus handled "
-"by the Event widget"
-msgstr "忽略æ¼è¾“å…¥ï¼Œå› ä¸ºå·²å°†å…¶æŒ‡å®šä¸ºä¸€ä¸ªäº‹ä»¶ï¼Œæ‰€ä»¥ç”±äº‹ä»¶ç¨‹åºå¤„ç†ã€‚"
+#. command line argument, do we skip packages that depend on the ones specified
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:521
+msgid "Do not install dependencies of the core packages"
+msgstr ""
+
+#. command line argument, do we operate quietly
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:524
+msgid "Do not display information or progress"
+msgstr ""
+
+#. TRANSLATORS: tool that gets called when the command is not found
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:542
+msgid "PackageKit Debuginfo Installer"
+msgstr ""
+
+#. TRANSLATORS: the use needs to specify a list of package names on the command line
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:556
+#, c-format
+msgid "ERROR: Specify package names to install."
+msgstr ""
+
+#. TRANSLATORS: we are getting the list of repositories
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:592
+#, c-format
+msgid "Getting sources list"
+msgstr "获å–资æºåˆ—表"
+
+#. TRANSLATORS: operation was not successful
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:602
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:677
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:761
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:805
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:872
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:916
+msgid "FAILED."
+msgstr "失败"
+
+#. TRANSLATORS: all completed 100%
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:617
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:657
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:692
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:776
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:820
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:887
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:931
+#, c-format
+msgid "OK."
+msgstr "完æˆ"
+
+#. TRANSLATORS: tell the user what we found
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:620
+#, c-format
+msgid "Found %i enabled and %i disabled sources."
+msgstr ""
+
+#. TRANSLATORS: we're finding repositories that match out pattern
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:627
+#, c-format
+msgid "Finding debugging sources"
+msgstr ""
+
+#. TRANSLATORS: tell the user what we found
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:660
+#, c-format
+msgid "Found %i disabled debuginfo repos."
+msgstr ""
+
+#. TRANSLATORS: we're now enabling all the debug sources we found
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:667
+#, c-format
+msgid "Enabling debugging sources"
+msgstr ""
+
+#. TRANSLATORS: tell the user how many we enabled
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:695
+#, c-format
+msgid "Enabled %i debugging sources."
+msgstr ""
+
+#. TRANSLATORS: we're now finding packages that match in all the repos
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:702
+#, c-format
+msgid "Finding debugging packages"
+msgstr ""
+
+#. TRANSLATORS: we couldn't find the package name, non-fatal
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:714
+#, c-format
+msgid "Failed to find the package %s: %s"
+msgstr ""
+
+#. TRANSLATORS: we couldn't find the debuginfo package name, non-fatal
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:737
+#, c-format
+msgid "Failed to find the debuginfo package %s: %s"
+msgstr ""
+
+#. TRANSLATORS: no debuginfo packages could be found to be installed
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:765
+#, c-format
+msgid "Found no packages to install."
+msgstr ""
+
+#. TRANSLATORS: tell the user we found some packages, and then list them
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:779
+#, c-format
+msgid "Found %i packages:"
+msgstr ""
+
+#. TRANSLATORS: tell the user we are searching for deps
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:795
+#, c-format
+msgid "Finding packages that depend on these packages"
+msgstr ""
+
+#. TRANSLATORS: could not install, detailed error follows
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:808
+#, c-format
+msgid "Could not find dependant packages: %s"
+msgstr ""
+
+#. TRANSLATORS: tell the user we found some more packages
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:824
+#, c-format
+msgid "Found %i extra packages."
+msgstr ""
+
+#. TRANSLATORS: tell the user we found some more packages
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:828
+#, c-format
+msgid "No extra packages required."
+msgstr ""
-#: ../src/mainwindow.cc:618
-msgid "System Sounds"
-msgstr "系统声音"
+#. TRANSLATORS: tell the user we found some packages (and deps), and then list them
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:837
+#, c-format
+msgid "Found %i packages to install:"
+msgstr ""
-#: ../src/rolewidget.cc:71
-msgid "pa_ext_stream_restore_write() failed"
-msgstr "pa_ext_stream_restore_write() 失败"
+#. TRANSLATORS: simulate mode is a testing mode where we quit before the action
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:850
+#, c-format
+msgid "Not installing packages in simulate mode"
+msgstr ""
-#: ../src/sinkinputwidget.cc:35
-msgid "on"
-msgstr "打开"
+#. TRANSLATORS: we are now installing the debuginfo packages we found earlier
+#. TRANSLATORS: transaction state, installing packages
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:862
+#: ../lib/packagekit-glib2/pk-console-shared.c:282
+#, c-format
+msgid "Installing packages"
+msgstr ""
-#: ../src/sinkinputwidget.cc:38
-msgid "Terminate Playback"
-msgstr "终æ¢å›žæ”¾"
+#. TRANSLATORS: could not install, detailed error follows
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:875
+#, c-format
+msgid "Could not install packages: %s"
+msgstr ""
-#: ../src/sinkinputwidget.cc:61
-msgid "Unknown output"
-msgstr "未知输出"
+#. TRANSLATORS: we are now disabling all debuginfo repos we previously enabled
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:907
+#, c-format
+msgid "Disabling sources previously enabled"
+msgstr ""
-#: ../src/sinkinputwidget.cc:72
-msgid "pa_context_set_sink_input_volume() failed"
-msgstr "pa_context_set_sink_input_volume() 失败"
+#. TRANSLATORS: no debuginfo packages could be found to be installed, detailed error follows
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:919
+#, c-format
+msgid "Could not disable the debugging sources: %s"
+msgstr ""
-#: ../src/sinkinputwidget.cc:87
-msgid "pa_context_set_sink_input_mute() failed"
-msgstr "pa_context_set_sink_input_mute() 失败"
+#. TRANSLATORS: we disabled all the debugging repos that we enabled before
+#: ../contrib/debuginfo-install/pk-debuginfo-install.c:934
+#, c-format
+msgid "Disabled %i debugging sources."
+msgstr ""
-#: ../src/sinkinputwidget.cc:97
-msgid "pa_context_kill_sink_input() failed"
-msgstr "pa_context_kill_sink_input() 失败"
+#. TRANSLATORS: couldn't open device to write
+#: ../contrib/device-rebind/pk-device-rebind.c:62
+msgid "Failed to open file"
+msgstr "打开文件失败"
+
+#. TRANSLATORS: could not write to the device
+#: ../contrib/device-rebind/pk-device-rebind.c:71
+msgid "Failed to write to the file"
+msgstr "写入文件失败"
+
+#. TRANSLATORS: we failed to release the current driver
+#: ../contrib/device-rebind/pk-device-rebind.c:111
+#: ../contrib/device-rebind/pk-device-rebind.c:148
+msgid "Failed to write to device"
+msgstr "写入设备失败"
+
+#. TRANSLATORS: the device could not be found in sysfs
+#: ../contrib/device-rebind/pk-device-rebind.c:176
+msgid "Device could not be found"
+msgstr ""
-#: ../src/sinkinputwidget.cc:133
-msgid "pa_context_move_sink_input_by_index() failed"
-msgstr "pa_context_move_sink_input_by_index() 失败"
+#. TRANSLATORS: we failed to release the current driver
+#: ../contrib/device-rebind/pk-device-rebind.c:203
+msgid "Failed to unregister driver"
+msgstr ""
-#: ../src/sinkwidget.cc:48
-msgid "pa_context_set_sink_volume_by_index() failed"
-msgstr "pa_context_set_sink_volume_by_index() 失败"
+#. TRANSLATORS: we failed to bind the old driver
+#: ../contrib/device-rebind/pk-device-rebind.c:212
+msgid "Failed to register driver"
+msgstr "注册驱动失败"
-#: ../src/sinkwidget.cc:63
-msgid "Volume Control Feedback Sound"
-msgstr "音é‡æŽ§åˆ¶å馈声音"
+#. TRANSLATORS: user did not specify a device sysfs path that exists
+#: ../contrib/device-rebind/pk-device-rebind.c:261
+msgid "Device path not found"
+msgstr ""
-#: ../src/sinkwidget.cc:80
-msgid "pa_context_set_sink_mute_by_index() failed"
-msgstr "pa_context_set_sink_mute_by_index() 失败"
+#. TRANSLATORS: user did not specify a valid device sysfs path
+#: ../contrib/device-rebind/pk-device-rebind.c:269
+msgid "Incorrect device path specified"
+msgstr ""
-#: ../src/sinkwidget.cc:94
-msgid "pa_context_set_default_sink() failed"
-msgstr "pa_context_set_default_sink() 失败"
+#: ../contrib/device-rebind/pk-device-rebind.c:294
+msgid "Show extra debugging information"
+msgstr ""
-#: ../src/sinkwidget.cc:114
-msgid "pa_context_set_sink_port_by_index() failed"
-msgstr "pa_context_set_sink_port_by_index() 失败"
+#. command line argument, simulate what would be done, but don't actually do it
+#: ../contrib/device-rebind/pk-device-rebind.c:297
+msgid "Don't actually touch the hardware, only simulate what would be done"
+msgstr ""
-#: ../src/sourceoutputwidget.cc:35
-msgid "from"
-msgstr "æ¥è‡ª"
+#. TRANSLATORS: command line option: a list of files to install
+#: ../contrib/device-rebind/pk-device-rebind.c:300
+msgid "Device paths"
+msgstr "设备路径"
-#: ../src/sourceoutputwidget.cc:38
-msgid "Terminate Recording"
-msgstr "终æ¢å½•åˆ¶"
+#. TRANSLATORS: tool that gets called when the device needs reloading after installing firmware
+#: ../contrib/device-rebind/pk-device-rebind.c:315
+msgid "PackageKit Device Reloader"
+msgstr ""
-#: ../src/sourceoutputwidget.cc:61
-msgid "Unknown input"
-msgstr "未知输入"
+#. TRANSLATORS: user did not specify a valid device sysfs path
+#: ../contrib/device-rebind/pk-device-rebind.c:323
+msgid "You need to specify at least one valid device path"
+msgstr ""
-#: ../src/sourceoutputwidget.cc:71
-msgid "pa_context_kill_source_output() failed"
-msgstr "pa_context_kill_source_output() 失败"
+#. TRANSLATORS: user did not specify a valid device sysfs path
+#: ../contrib/device-rebind/pk-device-rebind.c:333
+msgid "This script can only be used by the root user"
+msgstr ""
-#: ../src/sourceoutputwidget.cc:108
-msgid "pa_context_move_source_output_by_index() failed"
-msgstr "pa_context_move_source_output_by_index() 失败"
+#. TRANSLATORS: we're going to verify the path first
+#: ../contrib/device-rebind/pk-device-rebind.c:342
+msgid "Verifying device path"
+msgstr ""
-#: ../src/sourcewidget.cc:44
-msgid "pa_context_set_source_volume_by_index() failed"
-msgstr "pa_context_set_source_volume_by_index() 失败"
+#. TRANSLATORS: user did not specify a device sysfs path that exists
+#: ../contrib/device-rebind/pk-device-rebind.c:347
+msgid "Failed to verify device path"
+msgstr ""
-#: ../src/sourcewidget.cc:59
-msgid "pa_context_set_source_mute_by_index() failed"
-msgstr "pa_context_set_source_mute_by_index() 失败"
+#. TRANSLATORS: we're going to try
+#: ../contrib/device-rebind/pk-device-rebind.c:361
+msgid "Attempting to rebind device"
+msgstr ""
-#: ../src/sourcewidget.cc:73
-msgid "pa_context_set_default_source() failed"
-msgstr "pa_context_set_default_source() 失败"
+#. TRANSLATORS: we failed to release the current driver
+#: ../contrib/device-rebind/pk-device-rebind.c:366
+msgid "Failed to rebind device"
+msgstr ""
+
+#: ../data/packagekit-catalog.xml.in.h:1
+msgid "PackageKit Catalog"
+msgstr ""
+
+#: ../data/packagekit-package-list.xml.in.h:1
+msgid "PackageKit Package List"
+msgstr ""
+
+#: ../data/packagekit-servicepack.xml.in.h:1
+msgid "PackageKit Service Pack"
+msgstr ""
+
+#: ../lib/packagekit-glib2/pk-console-shared.c:59
+#, c-format
+msgid "Please enter a number from 1 to %i: "
+msgstr ""
+
+#. TRANSLATORS: more than one package could be found that matched, to follow is a list of possible packages
+#: ../lib/packagekit-glib2/pk-console-shared.c:183
+msgid "More than one package matches:"
+msgstr ""
+
+#. TRANSLATORS: This finds out which package in the list to use
+#: ../lib/packagekit-glib2/pk-console-shared.c:196
+msgid "Please choose the correct package: "
+msgstr ""
+
+#. TRANSLATORS: This is when the transaction status is not known
+#: ../lib/packagekit-glib2/pk-console-shared.c:250
+msgid "Unknown state"
+msgstr "未知状æ€"
+
+#. TRANSLATORS: transaction state, the daemon is in the process of starting
+#: ../lib/packagekit-glib2/pk-console-shared.c:254
+msgid "Starting"
+msgstr "æ£åœ¨å¼€å§‹"
+
+#. TRANSLATORS: transaction state, the transaction is waiting for another to complete
+#: ../lib/packagekit-glib2/pk-console-shared.c:258
+msgid "Waiting in queue"
+msgstr "队列ç‰å¾…"
+
+#. TRANSLATORS: transaction state, just started
+#: ../lib/packagekit-glib2/pk-console-shared.c:262
+msgid "Running"
+msgstr "æ£åœ¨è¿è¡Œ"
+
+#. TRANSLATORS: transaction state, is querying data
+#: ../lib/packagekit-glib2/pk-console-shared.c:266
+msgid "Querying"
+msgstr "查询"
+
+#. TRANSLATORS: transaction state, getting data from a server
+#: ../lib/packagekit-glib2/pk-console-shared.c:270
+msgid "Getting information"
+msgstr ""
+
+#. TRANSLATORS: transaction state, removing packages
+#: ../lib/packagekit-glib2/pk-console-shared.c:274
+msgid "Removing packages"
+msgstr ""
+
+#. TRANSLATORS: transaction state, downloading package files
+#. TRANSLATORS: The role of the transaction, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:278
+#: ../lib/packagekit-glib2/pk-console-shared.c:656
+msgid "Downloading packages"
+msgstr ""
+
+#. TRANSLATORS: transaction state, refreshing internal lists
+#: ../lib/packagekit-glib2/pk-console-shared.c:286
+msgid "Refreshing software list"
+msgstr ""
+
+#. TRANSLATORS: transaction state, installing updates
+#: ../lib/packagekit-glib2/pk-console-shared.c:290
+msgid "Installing updates"
+msgstr "æ£åœ¨å®‰è£…æ›´æ–°"
+
+#. TRANSLATORS: transaction state, removing old packages, and cleaning config files
+#: ../lib/packagekit-glib2/pk-console-shared.c:294
+msgid "Cleaning up packages"
+msgstr ""
+
+#. TRANSLATORS: transaction state, obsoleting old packages
+#: ../lib/packagekit-glib2/pk-console-shared.c:298
+msgid "Obsoleting packages"
+msgstr ""
-#: ../src/sourcewidget.cc:95
-msgid "pa_context_set_source_port_by_index() failed"
-msgstr "pa_context_set_source_port_by_index() 失败"
+#. TRANSLATORS: transaction state, checking the transaction before we do it
+#: ../lib/packagekit-glib2/pk-console-shared.c:302
+msgid "Resolving dependencies"
+msgstr ""
+
+#. TRANSLATORS: transaction state, checking if we have all the security keys for the operation
+#: ../lib/packagekit-glib2/pk-console-shared.c:306
+msgid "Checking signatures"
+msgstr ""
+
+#. TRANSLATORS: transaction state, when we return to a previous system state
+#. TRANSLATORS: The role of the transaction, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:310
+#: ../lib/packagekit-glib2/pk-console-shared.c:616
+msgid "Rolling back"
+msgstr "回滚"
+
+#. TRANSLATORS: transaction state, when we're doing a test transaction
+#: ../lib/packagekit-glib2/pk-console-shared.c:314
+msgid "Testing changes"
+msgstr ""
+
+#. TRANSLATORS: transaction state, when we're writing to the system package database
+#: ../lib/packagekit-glib2/pk-console-shared.c:318
+msgid "Committing changes"
+msgstr ""
+
+#. TRANSLATORS: transaction state, requesting data from a server
+#: ../lib/packagekit-glib2/pk-console-shared.c:322
+msgid "Requesting data"
+msgstr ""
+
+#. TRANSLATORS: transaction state, all done!
+#: ../lib/packagekit-glib2/pk-console-shared.c:326
+msgid "Finished"
+msgstr "结æŸ"
+
+#. TRANSLATORS: transaction state, in the process of cancelling
+#: ../lib/packagekit-glib2/pk-console-shared.c:330
+msgid "Cancelling"
+msgstr ""
+
+#. TRANSLATORS: transaction state, downloading metadata
+#: ../lib/packagekit-glib2/pk-console-shared.c:334
+msgid "Downloading repository information"
+msgstr ""
+
+#. TRANSLATORS: transaction state, downloading metadata
+#: ../lib/packagekit-glib2/pk-console-shared.c:338
+msgid "Downloading list of packages"
+msgstr ""
+
+#. TRANSLATORS: transaction state, downloading metadata
+#: ../lib/packagekit-glib2/pk-console-shared.c:342
+msgid "Downloading file lists"
+msgstr ""
+
+#. TRANSLATORS: transaction state, downloading metadata
+#: ../lib/packagekit-glib2/pk-console-shared.c:346
+msgid "Downloading lists of changes"
+msgstr ""
+
+#. TRANSLATORS: transaction state, downloading metadata
+#: ../lib/packagekit-glib2/pk-console-shared.c:350
+msgid "Downloading groups"
+msgstr ""
+
+#. TRANSLATORS: transaction state, downloading metadata
+#: ../lib/packagekit-glib2/pk-console-shared.c:354
+msgid "Downloading update information"
+msgstr ""
+
+#. TRANSLATORS: transaction state, repackaging delta files
+#: ../lib/packagekit-glib2/pk-console-shared.c:358
+msgid "Repackaging files"
+msgstr ""
+
+#. TRANSLATORS: transaction state, loading databases
+#: ../lib/packagekit-glib2/pk-console-shared.c:362
+msgid "Loading cache"
+msgstr ""
+
+#. TRANSLATORS: transaction state, scanning for running processes
+#: ../lib/packagekit-glib2/pk-console-shared.c:366
+msgid "Scanning applications"
+msgstr ""
+
+#. TRANSLATORS: transaction state, generating a list of packages installed on the system
+#: ../lib/packagekit-glib2/pk-console-shared.c:370
+msgid "Generating package lists"
+msgstr ""
+
+#. TRANSLATORS: transaction state, when we're waiting for the native tools to exit
+#: ../lib/packagekit-glib2/pk-console-shared.c:374
+msgid "Waiting for package manager lock"
+msgstr ""
+
+#. TRANSLATORS: transaction state, waiting for user to type in a password
+#: ../lib/packagekit-glib2/pk-console-shared.c:378
+msgid "Waiting for authentication"
+msgstr ""
+
+#. TRANSLATORS: transaction state, we are updating the list of processes
+#: ../lib/packagekit-glib2/pk-console-shared.c:382
+msgid "Updating running applications"
+msgstr ""
+
+#. TRANSLATORS: transaction state, we are checking executable files currently in use
+#: ../lib/packagekit-glib2/pk-console-shared.c:386
+msgid "Checking applications in use"
+msgstr ""
+
+#. TRANSLATORS: transaction state, we are checking for libraries currently in use
+#: ../lib/packagekit-glib2/pk-console-shared.c:390
+msgid "Checking libraries in use"
+msgstr ""
+
+#. TRANSLATORS: transaction state, we are copying package files before or after the transaction
+#: ../lib/packagekit-glib2/pk-console-shared.c:394
+msgid "Copying files"
+msgstr "æ‹·è´æ–‡ä»¶"
+
+#. TRANSLATORS: The type of update
+#: ../lib/packagekit-glib2/pk-console-shared.c:412
+msgid "Trivial"
+msgstr ""
+
+#. TRANSLATORS: The type of update
+#: ../lib/packagekit-glib2/pk-console-shared.c:416
+msgid "Normal"
+msgstr "普通"
+
+#. TRANSLATORS: The type of update
+#: ../lib/packagekit-glib2/pk-console-shared.c:420
+msgid "Important"
+msgstr "é‡è¦çš„"
+
+#. TRANSLATORS: The type of update
+#: ../lib/packagekit-glib2/pk-console-shared.c:424
+msgid "Security"
+msgstr "安全"
+
+#. TRANSLATORS: The type of update
+#: ../lib/packagekit-glib2/pk-console-shared.c:428
+msgid "Bug fix "
+msgstr "Bug ä¿®å¤"
+
+#. TRANSLATORS: The type of update
+#: ../lib/packagekit-glib2/pk-console-shared.c:432
+msgid "Enhancement"
+msgstr "增强"
+
+#. TRANSLATORS: The type of update
+#: ../lib/packagekit-glib2/pk-console-shared.c:436
+msgid "Blocked"
+msgstr ""
+
+#. TRANSLATORS: The state of a package
+#. TRANSLATORS: The action of the package, in past tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:441
+#: ../lib/packagekit-glib2/pk-console-shared.c:514
+msgid "Installed"
+msgstr "已安装"
+
+#. TRANSLATORS: The state of a package, i.e. not installed
+#: ../lib/packagekit-glib2/pk-console-shared.c:446
+msgid "Available"
+msgstr ""
+
+#. TRANSLATORS: The action of the package, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:464
+msgid "Downloading"
+msgstr "æ£åœ¨ä¸‹è½½"
+
+#. TRANSLATORS: The action of the package, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:468
+msgid "Updating"
+msgstr ""
+
+#. TRANSLATORS: The action of the package, in present tense
+#. TRANSLATORS: The role of the transaction, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:472
+#: ../lib/packagekit-glib2/pk-console-shared.c:592
+msgid "Installing"
+msgstr ""
+
+#. TRANSLATORS: The action of the package, in present tense
+#. TRANSLATORS: The role of the transaction, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:476
+#: ../lib/packagekit-glib2/pk-console-shared.c:588
+msgid "Removing"
+msgstr "移除"
+
+#. TRANSLATORS: The action of the package, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:480
+msgid "Cleaning up"
+msgstr ""
+
+#. TRANSLATORS: The action of the package, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:484
+msgid "Obsoleting"
+msgstr ""
+
+#. TRANSLATORS: The action of the package, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:488
+msgid "Reinstalling"
+msgstr ""
+
+#. TRANSLATORS: The action of the package, in past tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:506
+msgid "Downloaded"
+msgstr "已下载"
+
+#. TRANSLATORS: The action of the package, in past tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:518
+msgid "Removed"
+msgstr "å·²ç»ç§»é™¤"
+
+#. TRANSLATORS: The action of the package, in past tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:522
+msgid "Cleaned up"
+msgstr "清ç†"
+
+#. TRANSLATORS: The action of the package, in past tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:526
+msgid "Obsoleted"
+msgstr ""
+
+#. TRANSLATORS: The action of the package, in past tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:530
+msgid "Reinstalled"
+msgstr ""
+
+#. TRANSLATORS: The role of the transaction, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:548
+msgid "Unknown role type"
+msgstr "未知任务类型"
+
+#. TRANSLATORS: The role of the transaction, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:552
+msgid "Getting dependencies"
+msgstr ""
+
+#. TRANSLATORS: The role of the transaction, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:556
+msgid "Getting update details"
+msgstr ""
+
+#. TRANSLATORS: The role of the transaction, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:560
+msgid "Getting details"
+msgstr ""
+
+#. TRANSLATORS: The role of the transaction, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:564
+msgid "Getting requires"
+msgstr ""
+
+#. TRANSLATORS: The role of the transaction, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:568
+msgid "Getting updates"
+msgstr ""
+
+#. TRANSLATORS: The role of the transaction, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:572
+msgid "Searching by details"
+msgstr ""
+
+#. TRANSLATORS: The role of the transaction, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:576
+msgid "Searching by file"
+msgstr ""
+
+#. TRANSLATORS: The role of the transaction, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:580
+msgid "Searching groups"
+msgstr ""
+
+#. TRANSLATORS: The role of the transaction, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:584
+msgid "Searching by name"
+msgstr ""
+
+#. TRANSLATORS: The role of the transaction, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:596
+msgid "Installing files"
+msgstr "æ£åœ¨å®‰è£…文件"
+
+#. TRANSLATORS: The role of the transaction, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:600
+msgid "Refreshing cache"
+msgstr ""
+
+#. TRANSLATORS: The role of the transaction, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:604
+msgid "Updating packages"
+msgstr ""
+
+#. TRANSLATORS: The role of the transaction, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:608
+msgid "Updating system"
+msgstr "更新系统"
+
+#. TRANSLATORS: The role of the transaction, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:612
+msgid "Canceling"
+msgstr "æ£åœ¨å–消"
+
+#. TRANSLATORS: The role of the transaction, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:620
+msgid "Getting repositories"
+msgstr ""
+
+#. TRANSLATORS: The role of the transaction, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:624
+msgid "Enabling repository"
+msgstr ""
+
+#. TRANSLATORS: The role of the transaction, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:628
+msgid "Setting data"
+msgstr "é…置数æ®"
+
+#. TRANSLATORS: The role of the transaction, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:632
+msgid "Resolving"
+msgstr "解决"
+
+#. TRANSLATORS: The role of the transaction, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:636
+msgid "Getting file list"
+msgstr "获得文件列表"
+
+#. TRANSLATORS: The role of the transaction, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:640
+msgid "Getting provides"
+msgstr "获得æ供者"
+
+#. TRANSLATORS: The role of the transaction, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:644
+msgid "Installing signature"
+msgstr ""
+
+#. TRANSLATORS: The role of the transaction, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:648
+msgid "Getting packages"
+msgstr "获å–包"
+
+#. TRANSLATORS: The role of the transaction, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:652
+msgid "Accepting EULA"
+msgstr ""
+
+#. TRANSLATORS: The role of the transaction, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:660
+msgid "Getting upgrades"
+msgstr "开始å‡çº§"
+
+#. TRANSLATORS: The role of the transaction, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:664
+msgid "Getting categories"
+msgstr ""
+
+#. TRANSLATORS: The role of the transaction, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:668
+msgid "Getting transactions"
+msgstr ""
+
+#. TRANSLATORS: The role of the transaction, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:672
+#: ../lib/packagekit-glib2/pk-console-shared.c:676
+msgid "Simulating install"
+msgstr ""
+
+#. TRANSLATORS: The role of the transaction, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:680
+msgid "Simulating remove"
+msgstr ""
+
+#. TRANSLATORS: The role of the transaction, in present tense
+#: ../lib/packagekit-glib2/pk-console-shared.c:684
+msgid "Simulating update"
+msgstr ""
+
+#. TRANSLATORS: ask the user if they are comfortable installing insecure packages
+#: ../lib/packagekit-glib2/pk-task-text.c:69
+msgid "Do you want to allow installing of unsigned software?"
+msgstr ""
+
+#. TRANSLATORS: tell the user we've not done anything
+#: ../lib/packagekit-glib2/pk-task-text.c:74
+msgid "The unsigned software will not be installed."
+msgstr ""
+
+#. TRANSLATORS: the package repository is signed by a key that is not recognised
+#: ../lib/packagekit-glib2/pk-task-text.c:123
+msgid "Software source signature required"
+msgstr ""
+
+#. TRANSLATORS: the package repository name
+#: ../lib/packagekit-glib2/pk-task-text.c:129
+msgid "Software source name"
+msgstr ""
+
+#. TRANSLATORS: the key URL
+#: ../lib/packagekit-glib2/pk-task-text.c:132
+msgid "Key URL"
+msgstr ""
+
+#. TRANSLATORS: the username of the key
+#: ../lib/packagekit-glib2/pk-task-text.c:135
+msgid "Key user"
+msgstr ""
+
+#. TRANSLATORS: the key ID, usually a few hex digits
+#: ../lib/packagekit-glib2/pk-task-text.c:138
+msgid "Key ID"
+msgstr ""
+
+#. TRANSLATORS: the key fingerprint, again, yet more hex
+#: ../lib/packagekit-glib2/pk-task-text.c:141
+msgid "Key fingerprint"
+msgstr ""
+
+#. TRANSLATORS: the timestamp (a bit like a machine readable time)
+#: ../lib/packagekit-glib2/pk-task-text.c:144
+msgid "Key Timestamp"
+msgstr ""
+
+#. TRANSLATORS: ask the user if they want to import
+#: ../lib/packagekit-glib2/pk-task-text.c:157
+msgid "Do you accept this signature?"
+msgstr ""
+
+#. TRANSLATORS: tell the user we've not done anything
+#: ../lib/packagekit-glib2/pk-task-text.c:162
+msgid "The signature was not accepted."
+msgstr ""
+
+#. TRANSLATORS: this is another name for a software licence that has to be read before installing
+#: ../lib/packagekit-glib2/pk-task-text.c:205
+msgid "End user licence agreement required"
+msgstr ""
+
+#. TRANSLATORS: the EULA text itself (long and boring)
+#: ../lib/packagekit-glib2/pk-task-text.c:214
+msgid "Agreement"
+msgstr "åŒæ„"
+
+#. TRANSLATORS: ask the user if they've read and accepted the EULA
+#: ../lib/packagekit-glib2/pk-task-text.c:223
+msgid "Do you accept this agreement?"
+msgstr ""
+
+#. TRANSLATORS: tell the user we've not done anything
+#: ../lib/packagekit-glib2/pk-task-text.c:228
+msgid "The agreement was not accepted."
+msgstr ""
+
+#. TRANSLATORS: the user needs to change media inserted into the computer
+#: ../lib/packagekit-glib2/pk-task-text.c:267
+msgid "Media change required"
+msgstr ""
+
+#. TRANSLATORS: the type, e.g. DVD, CD, etc
+#: ../lib/packagekit-glib2/pk-task-text.c:270
+msgid "Media type"
+msgstr "媒体类型"
+
+#. TRANSLATORS: the media label, usually like 'disk-1of3'
+#: ../lib/packagekit-glib2/pk-task-text.c:273
+msgid "Media label"
+msgstr "åª’ä½“æ ‡ç¾"
+
+#. TRANSLATORS: the media description, usually like 'Fedora 12 disk 5'
+#: ../lib/packagekit-glib2/pk-task-text.c:276
+msgid "Text"
+msgstr ""
+
+#. TRANSLATORS: ask the user to insert the media
+#: ../lib/packagekit-glib2/pk-task-text.c:282
+msgid "Please insert the correct media"
+msgstr ""
+
+#. TRANSLATORS: tell the user we've not done anything as they are lazy
+#: ../lib/packagekit-glib2/pk-task-text.c:287
+msgid "The correct media was not inserted."
+msgstr ""
+
+#. TRANSLATORS: When processing, we might have to remove other dependencies
+#: ../lib/packagekit-glib2/pk-task-text.c:302
+msgid "The following packages have to be removed:"
+msgstr ""
+
+#. TRANSLATORS: When processing, we might have to install other dependencies
+#: ../lib/packagekit-glib2/pk-task-text.c:307
+msgid "The following packages have to be installed:"
+msgstr ""
+
+#. TRANSLATORS: When processing, we might have to update other dependencies
+#: ../lib/packagekit-glib2/pk-task-text.c:312
+msgid "The following packages have to be updated:"
+msgstr ""
+
+#. TRANSLATORS: When processing, we might have to reinstall other dependencies
+#: ../lib/packagekit-glib2/pk-task-text.c:317
+msgid "The following packages have to be reinstalled:"
+msgstr ""
+
+#. TRANSLATORS: When processing, we might have to downgrade other dependencies
+#: ../lib/packagekit-glib2/pk-task-text.c:322
+msgid "The following packages have to be downgraded:"
+msgstr ""
+
+#. TRANSLATORS: ask the user if the proposed changes are okay
+#: ../lib/packagekit-glib2/pk-task-text.c:382
+msgid "Proceed with changes?"
+msgstr ""
+
+#. TRANSLATORS: tell the user we didn't do anything
+#: ../lib/packagekit-glib2/pk-task-text.c:387
+msgid "The transaction did not proceed."
+msgstr ""
+
+#. SECURITY:
+#. - Normal users do not require admin authentication to accept new
+#. licence agreements.
+#. - Change this to 'auth_admin' for environments where users should not
+#. be given the option to make legal decisions.
+#.
+#: ../policy/org.freedesktop.packagekit.policy.in.h:7
+msgid "Accept EULA"
+msgstr ""
+
+#: ../policy/org.freedesktop.packagekit.policy.in.h:8
+msgid "Authentication is required to accept a EULA"
+msgstr ""
+
+#: ../policy/org.freedesktop.packagekit.policy.in.h:9
+msgid "Authentication is required to cancel a task that was not started by yourself"
+msgstr ""
+
+#: ../policy/org.freedesktop.packagekit.policy.in.h:10
+msgid "Authentication is required to change software source parameters"
+msgstr ""
+
+#: ../policy/org.freedesktop.packagekit.policy.in.h:11
+msgid "Authentication is required to consider a key used for signing packages as trusted"
+msgstr ""
+
+#: ../policy/org.freedesktop.packagekit.policy.in.h:12
+msgid "Authentication is required to install a signed package"
+msgstr ""
+
+#: ../policy/org.freedesktop.packagekit.policy.in.h:13
+msgid "Authentication is required to install an untrusted package"
+msgstr ""
+
+#: ../policy/org.freedesktop.packagekit.policy.in.h:14
+msgid "Authentication is required to refresh the system sources"
+msgstr ""
+
+#: ../policy/org.freedesktop.packagekit.policy.in.h:15
+msgid "Authentication is required to reload the device with a new driver"
+msgstr ""
+
+#: ../policy/org.freedesktop.packagekit.policy.in.h:16
+msgid "Authentication is required to remove packages"
+msgstr ""
+
+#: ../policy/org.freedesktop.packagekit.policy.in.h:17
+msgid "Authentication is required to rollback a transaction"
+msgstr ""
+
+#: ../policy/org.freedesktop.packagekit.policy.in.h:18
+msgid "Authentication is required to set the network proxy used for downloading packages"
+msgstr ""
+
+#: ../policy/org.freedesktop.packagekit.policy.in.h:19
+msgid "Authentication is required to update packages"
+msgstr ""
+
+#. SECURITY:
+#. - Normal users are allowed to cancel their own task without
+#. authentication, but a different user id needs the admin password
+#. to cancel another users task.
+#.
+#: ../policy/org.freedesktop.packagekit.policy.in.h:25
+msgid "Cancel foreign task"
+msgstr ""
+
+#. SECURITY:
+#. - Normal users require admin authentication to enable or disable
+#. software sources as this can be used to enable new updates or
+#. install different versions of software.
+#.
+#: ../policy/org.freedesktop.packagekit.policy.in.h:31
+msgid "Change software source parameters"
+msgstr ""
+
+#. SECURITY:
+#. - Normal users do not need authentication to install signed packages
+#. from signed repositories, as this cannot exploit a system.
+#. - Paranoid users (or parents!) can change this to 'auth_admin' or
+#. 'auth_admin_keep'.
+#.
+#: ../policy/org.freedesktop.packagekit.policy.in.h:38
+msgid "Install signed package"
+msgstr "å®‰è£…å·²æ ‡è®°çš„è½¯ä»¶åŒ…"
+
+#. SECURITY:
+#. - Normal users require admin authentication to install untrusted or
+#. unrecognised packages, as allowing users to do this without a
+#. password would be a massive security hole.
+#. - This is not retained as each package should be authenticated.
+#.
+#: ../policy/org.freedesktop.packagekit.policy.in.h:45
+msgid "Install untrusted local file"
+msgstr ""
+
+#. SECURITY:
+#. - Normal users do not require admin authentication to refresh the
+#. cache, as this doesn't actually install or remove software.
+#.
+#: ../policy/org.freedesktop.packagekit.policy.in.h:50
+msgid "Refresh system sources"
+msgstr "刷新系统æº"
+
+#. SECURITY:
+#. - Normal users require admin authentication to rebind a driver
+#. so that it works after we install firmware.
+#. - This should not be set to 'yes' as unprivileged users could then
+#. try to rebind drivers in use, for instance security authentication
+#. devices.
+#.
+#: ../policy/org.freedesktop.packagekit.policy.in.h:58
+msgid "Reload a device"
+msgstr "é‡æ–°è½½å…¥è®¾å¤‡"
+
+#. SECURITY:
+#. - Normal users require admin authentication to remove packages as
+#. this can make the system unbootable or stop other applications from
+#. working.
+#. - Be sure to close the tool used to remove the packages after the
+#. admin authentication has been obtained, otherwise packages can still
+#. be removed. If this is not possible, change this authentication to
+#. 'auth_admin'.
+#.
+#: ../policy/org.freedesktop.packagekit.policy.in.h:68
+msgid "Remove package"
+msgstr "移除软件包"
+
+#. SECURITY:
+#. - Normal users require admin authentication to rollback system state
+#. as this will change a large number of packages, and could expose the
+#. system to previously patched security vulnerabilities.
+#.
+#: ../policy/org.freedesktop.packagekit.policy.in.h:74
+msgid "Rollback to a previous transaction"
+msgstr ""
+
+#. SECURITY:
+#. - Normal users do not require admin authentication to set the proxy
+#. used for downloading packages.
+#.
+#: ../policy/org.freedesktop.packagekit.policy.in.h:79
+msgid "Set network proxy"
+msgstr "设置新的网络代ç†"
+
+#. SECURITY:
+#. - Normal users require admin authentication to add signing keys.
+#. - This implies adding an explicit trust, and should not be granted
+#. without a secure authentication.
+#. - This is not kept as each package should be authenticated.
+#.
+#: ../policy/org.freedesktop.packagekit.policy.in.h:86
+msgid "Trust a key used for signing packages"
+msgstr ""
+
+#. SECURITY:
+#. - Normal users do not require admin authentication to update the
+#. system as the packages will be signed, and the action is required
+#. to update the system when unattended.
+#. - Changing this to anything other than 'yes' will break unattended
+#. updates.
+#.
+#: ../policy/org.freedesktop.packagekit.policy.in.h:94
+msgid "Update packages"
+msgstr "更新软件包"
+
+#. TRANSLATORS: failed due to DBus security
+#: ../src/pk-main.c:87
+msgid "Startup failed due to security policies on this machine."
+msgstr ""
+
+#. TRANSLATORS: only two ways this can fail...
+#: ../src/pk-main.c:89
+msgid "This can happen for two reasons:"
+msgstr ""
+
+#. TRANSLATORS: only allowed to be owned by root
+#: ../src/pk-main.c:91
+msgid "The correct user is not launching the executable (usually root)"
+msgstr ""
-#: ../src/streamwidget.cc:45
-msgid "Terminate"
-msgstr "终æ¢"
+#. TRANSLATORS: or we are installed in a prefix
+#: ../src/pk-main.c:93
+msgid "The org.freedesktop.PackageKit.conf file is not installed in the system directory:"
+msgstr "org.freedesktop.PackageKit.conf 文件没有å†ç³»ç»Ÿç›®å½•ä¸å®‰è£…"
+
+#. TRANSLATORS: a backend is the system package tool, e.g. yum, apt
+#: ../src/pk-main.c:199
+msgid "Packaging backend to use, e.g. dummy"
+msgstr "包装åŽç«¯ä½¿ç”¨ï¼Œä¾‹å¦‚：dummy"
+
+#. TRANSLATORS: if we should run in the background
+#: ../src/pk-main.c:202
+msgid "Daemonize and detach from the terminal"
+msgstr "æ— äº¤äº’åŽå°ç¨‹åº 从终端分离"
+
+#. TRANSLATORS: if we should not monitor how long we are inactive for
+#: ../src/pk-main.c:205
+msgid "Disable the idle timer"
+msgstr "ç¦ç”¨ æ— ç”¨çš„ 计时器"
+
+#. TRANSLATORS: show version
+#: ../src/pk-main.c:208
+msgid "Show version and exit"
+msgstr "显示版本并退出"
+
+#. TRANSLATORS: exit after we've started up, used for user profiling
+#: ../src/pk-main.c:211
+msgid "Exit after a small delay"
+msgstr "ç¨åŽé€€å‡º"
+
+#. TRANSLATORS: exit straight away, used for automatic profiling
+#: ../src/pk-main.c:214
+msgid "Exit after the engine has loaded"
+msgstr "引擎载入åŽé€€å‡º"
+
+#. TRANSLATORS: describing the service that is running
+#: ../src/pk-main.c:229
+msgid "PackageKit service"
+msgstr "PackageKit æœåŠ¡"
+
+#. TRANSLATORS: fatal error, dbus is not running
+#: ../src/pk-main.c:266
+msgid "Cannot connect to the system bus"
+msgstr "ä¸èƒ½é“¾æŽ¥åˆ°ç³»ç»Ÿæ€»çº¿"
+
+#. TRANSLATORS: cannot register on system bus, unknown reason -- geeky error follows
+#: ../src/pk-main.c:317
+msgid "Error trying to start:"
+msgstr "å¯åŠ¨å¤±è´¥ï¼š"
+
+#: ../src/pk-polkit-action-lookup.c:150
+msgid "To install debugging packages, extra sources need to be enabled"
+msgstr "è¦å®‰è£…调试软件包，需è¦å¯ç”¨ é¢å¤– çš„æº"
+
+#. TRANSLATORS: is not GPG signed
+#: ../src/pk-polkit-action-lookup.c:171
+#: ../src/pk-polkit-action-lookup.c:190
+msgid "The software is not from a trusted source."
+msgstr "该软件ä¸æ˜¯ä»Žä¿¡ä»»çš„æºä¸å¾—到的"
+
+#: ../src/pk-polkit-action-lookup.c:176
+msgid "Do not update this package unless you are sure it is safe to do so."
+msgstr "ä¸å‡çº§è¿™ä¸ªåŒ…，除éžä½ 能够确定这些æ“作是安全的"
+
+#: ../src/pk-polkit-action-lookup.c:177
+msgid "Do not update these packages unless you are sure it is safe to do so."
+msgstr "ä¸å‡çº§è¿™äº›åŒ…，除éžä½ 能够确定这些æ“作是安全的"
+
+#: ../src/pk-polkit-action-lookup.c:195
+msgid "Do not install this package unless you are sure it is safe to do so."
+msgstr "这个安装包将ä¸è¢«å®‰è£…，除éžä½ 能够确定这些æ“作是安全的"
+
+#: ../src/pk-polkit-action-lookup.c:196
+msgid "Do not install these packages unless you are sure it is safe to do so."
+msgstr "这些包将ä¸è¢«å®‰è£…，除éžä½ 能够确定这些æ“作是安全的"
+
+#. TRANSLATORS: too many packages to list each one
+#: ../src/pk-polkit-action-lookup.c:273
+msgid "Many packages"
+msgstr "许多包"
+
+#. TRANSLATORS: if the transaction is forced to install only trusted packages
+#: ../src/pk-polkit-action-lookup.c:339
+msgid "Only trusted"
+msgstr "被信任的"
+
+#. TRANSLATORS: turn on all debugging
+#: ../src/egg-debug.c:388
+msgid "Show debugging information for all files"
+msgstr "显示所有文件的调试信æ¯"
+
+#. TRANSLATORS: a list of modules to debug
+#: ../src/egg-debug.c:459
+msgid "Debug these specific modules"
+msgstr "调试这些特定的模å—"
+
+#. TRANSLATORS: a list of functions to debug
+#: ../src/egg-debug.c:462
+msgid "Debug these specific functions"
+msgstr "调试这些特定的函数"
+
+#. TRANSLATORS: save to a log
+#: ../src/egg-debug.c:465
+msgid "Log debugging data to a file"
+msgstr "调试日志信æ¯å†™å…¥æ–‡ä»¶"
+
+#: ../src/egg-debug.c:469
+msgid "Debugging Options"
+msgstr "调试选项"
+
+#: ../src/egg-debug.c:469
+msgid "Show debugging options"
+msgstr "显示调试选项"
+
+#~ msgid "Adjust the volume level"
+#~ msgstr "调节音é‡æ°´å¹³"
+#~ msgid "PulseAudio Volume Control"
+#~ msgstr "PulseAudio 音é‡æŽ§åˆ¶"
+#~ msgid "Volume Control"
+#~ msgstr "音é‡æŽ§åˆ¶"
+#~ msgid "50%"
+#~ msgstr "50%"
+#~ msgid "<b>Port:</b>"
+#~ msgstr "<b>端å£ï¼š</b>"
+#~ msgid "<b>Profile:</b>"
+#~ msgstr "<b>侧写：</b>"
+#~ msgid "<b>S_how:</b>"
+#~ msgstr "<b>显示(_h)：</b>"
+#~ msgid "<b>Sho_w:</b>"
+#~ msgstr "<b>显示(_w)：</b>"
+#~ msgid "<b>_Show:</b>"
+#~ msgstr "<b>显示(_S)：</b>"
+#~ msgid "<b>left-front</b>"
+#~ msgstr "<b>å·¦-å‰</b>"
+#~ msgid "<i>No application is currently playing audio.</i>"
+#~ msgstr "<i>没有程åºæ£åœ¨æ’放音频。</i>"
+#~ msgid "<i>No application is currently recording audio.</i>"
+#~ msgstr "<i>没有程åºæ£åœ¨å½•éŸ³ã€‚</i>"
+#~ msgid "<i>No cards available for configuration</i>"
+#~ msgstr "<i>没有å¯ç”¨æ¥é…置的声å¡</i>"
+#~ msgid "<i>No input devices available</i>"
+#~ msgstr "<i>没有å¯ç”¨çš„输入设备</i>"
+#~ msgid "<i>No output devices available</i>"
+#~ msgstr "<i>没有å¯ç”¨çš„输出设备</i>"
+#~ msgid ""
+#~ "All Input Devices\n"
+#~ "All Except Monitors\n"
+#~ "Hardware Input Devices\n"
+#~ "Virtual Input Devices\n"
+#~ "Monitors"
+#~ msgstr ""
+#~ "全部输入设备\n"
+#~ "全部但ä¸åŒ…括监视器\n"
+#~ "硬件输入设备\n"
+#~ "虚拟输入设备\n"
+#~ "监视器"
+#~ msgid ""
+#~ "All Output Devices\n"
+#~ "Hardware Output Devices\n"
+#~ "Virtual Output Devices"
+#~ msgstr ""
+#~ "全部输出设备\n"
+#~ "硬件输出设备\n"
+#~ "虚拟输出设备"
+#~ msgid ""
+#~ "All Streams\n"
+#~ "Applications\n"
+#~ "Virtual Streams"
+#~ msgstr ""
+#~ "所有æµåª’体\n"
+#~ "程åº\n"
+#~ "虚拟æµåª’体"
+#~ msgid "Lock channels together"
+#~ msgstr "é”定声é“"
+#~ msgid "Mute audio"
+#~ msgstr "音频é™éŸ³"
+#~ msgid "Set as fallback"
+#~ msgstr "设定为回放"
+#~ msgid "_Input Devices"
+#~ msgstr "输入设备(_I)"
+#~ msgid "_Output Devices"
+#~ msgstr "输出设备(_O)"
+#~ msgid "_Playback"
+#~ msgstr "回放(_P)"
+#~ msgid "Card callback failure"
+#~ msgstr "声å¡å›žå«å¤±è´¥"
+#~ msgid "Sink callback failure"
+#~ msgstr "Sink 回å«å¤±è´¥"
+#~ msgid "Source callback failure"
+#~ msgstr "æºå›žå«å¤±è´¥"
+#~ msgid "Sink input callback failure"
+#~ msgstr "Sink 输入回å«å¤±è´¥"
+#~ msgid "Source output callback failure"
+#~ msgstr "æºè¾“出回å«å¤±è´¥"
+#~ msgid "Client callback failure"
+#~ msgstr "客户端回å«å¤±è´¥"
+#~ msgid "Server info callback failure"
+#~ msgstr "æœåŠ¡å™¨ä¿¡æ¯å›žå«å¤±è´¥"
+#~ msgid "Failed to initialize stream_restore extension: %s"
+#~ msgstr "åˆå§‹åŒ– stream_restore 扩展失败：%s"
+#~ msgid "pa_ext_stream_restore_read() failed"
+#~ msgstr "pa_ext_stream_restore_read() 失败"
+#~ msgid "pa_context_get_sink_info_by_index() failed"
+#~ msgstr "pa_context_get_sink_info_by_index() 失败"
+#~ msgid "pa_context_get_source_info_by_index() failed"
+#~ msgstr "pa_context_get_source_info_by_index() 失败"
+#~ msgid "pa_context_get_sink_input_info() failed"
+#~ msgstr "pa_context_get_sink_input_info() 失败"
+#~ msgid "pa_context_get_client_info() failed"
+#~ msgstr "pa_context_get_client_info() 失败"
+#~ msgid "pa_context_get_server_info() failed"
+#~ msgstr "pa_context_get_server_info() 失败"
+#~ msgid "pa_context_get_card_info_by_index() failed"
+#~ msgstr "pa_context_get_card_info_by_index() 失败"
+#~ msgid "pa_context_subscribe() failed"
+#~ msgstr "pa_context_subscribe() 失败"
+#~ msgid "pa_context_client_info_list() failed"
+#~ msgstr "pa_context_client_info_list() 失败"
+#~ msgid "pa_context_get_card_info_list() failed"
+#~ msgstr "pa_context_get_card_info_list() 失败"
+#~ msgid "pa_context_get_sink_info_list() failed"
+#~ msgstr "pa_context_get_sink_info_list() 失败"
+#~ msgid "pa_context_get_source_info_list() failed"
+#~ msgstr "pa_context_get_source_info_list() 失败"
+#~ msgid "pa_context_get_sink_input_info_list() failed"
+#~ msgstr "pa_context_get_sink_input_info_list() 失败"
+#~ msgid "pa_context_get_source_output_info_list() failed"
+#~ msgstr "pa_context_get_source_output_info_list() 失败"
+#~ msgid "pa_context_set_card_profile_by_index() failed"
+#~ msgstr "pa_context_set_card_profile_by_index() failed"
+#~ msgid "<small>Silence</small>"
+#~ msgstr "<small>é™éŸ³</small>"
+#~ msgid "<small>Min</small>"
+#~ msgstr "<small>最å°</small>"
+#~ msgid "<small>Max</small>"
+#~ msgstr "<small>最大</small>"
+#~ msgid "<small><i>Base</i></small>"
+#~ msgstr "<small><i>低音</i></small>"
+#~ msgid "Peak detect"
+#~ msgstr "尖峰探测"
+#~ msgid "Failed to connect monitoring stream"
+#~ msgstr "æ— æ³•è¿žæŽ¥åˆ°ç›‘è§†æµåª’体"
+#~ msgid ""
+#~ "Ignoring sink-input due to it being designated as an event and thus "
+#~ "handled by the Event widget"
+#~ msgstr "忽略æ¼è¾“å…¥ï¼Œå› ä¸ºå·²å°†å…¶æŒ‡å®šä¸ºä¸€ä¸ªäº‹ä»¶ï¼Œæ‰€ä»¥ç”±äº‹ä»¶ç¨‹åºå¤„ç†ã€‚"
+#~ msgid "System Sounds"
+#~ msgstr "系统声音"
+#~ msgid "pa_ext_stream_restore_write() failed"
+#~ msgstr "pa_ext_stream_restore_write() 失败"
+#~ msgid "Terminate Playback"
+#~ msgstr "终æ¢å›žæ”¾"
+#~ msgid "pa_context_set_sink_input_volume() failed"
+#~ msgstr "pa_context_set_sink_input_volume() 失败"
+#~ msgid "pa_context_set_sink_input_mute() failed"
+#~ msgstr "pa_context_set_sink_input_mute() 失败"
+#~ msgid "pa_context_kill_sink_input() failed"
+#~ msgstr "pa_context_kill_sink_input() 失败"
+#~ msgid "pa_context_move_sink_input_by_index() failed"
+#~ msgstr "pa_context_move_sink_input_by_index() 失败"
+#~ msgid "pa_context_set_sink_volume_by_index() failed"
+#~ msgstr "pa_context_set_sink_volume_by_index() 失败"
+#~ msgid "Volume Control Feedback Sound"
+#~ msgstr "音é‡æŽ§åˆ¶å馈声音"
+#~ msgid "pa_context_set_sink_mute_by_index() failed"
+#~ msgstr "pa_context_set_sink_mute_by_index() 失败"
+#~ msgid "pa_context_set_default_sink() failed"
+#~ msgstr "pa_context_set_default_sink() 失败"
+#~ msgid "pa_context_set_sink_port_by_index() failed"
+#~ msgstr "pa_context_set_sink_port_by_index() 失败"
+#~ msgid "from"
+#~ msgstr "æ¥è‡ª"
+#~ msgid "Terminate Recording"
+#~ msgstr "终æ¢å½•åˆ¶"
+#~ msgid "Unknown input"
+#~ msgstr "未知输入"
+#~ msgid "pa_context_kill_source_output() failed"
+#~ msgstr "pa_context_kill_source_output() 失败"
+#~ msgid "pa_context_move_source_output_by_index() failed"
+#~ msgstr "pa_context_move_source_output_by_index() 失败"
+#~ msgid "pa_context_set_source_volume_by_index() failed"
+#~ msgstr "pa_context_set_source_volume_by_index() 失败"
+#~ msgid "pa_context_set_source_mute_by_index() failed"
+#~ msgstr "pa_context_set_source_mute_by_index() 失败"
+#~ msgid "pa_context_set_default_source() failed"
+#~ msgstr "pa_context_set_default_source() 失败"
+#~ msgid "pa_context_set_source_port_by_index() failed"
+#~ msgstr "pa_context_set_source_port_by_index() 失败"
+#~ msgid "Terminate"
+#~ msgstr "终æ¢"
commit 48d4b071ec699afbb488635c2e906082d2b9dd20
Author: Tim Waugh <twaugh at redhat.com>
Date: Fri Jan 8 22:37:41 2010 +0000
bugfix: fixed packagekit.client.install_packages() in Python bindings.
diff --git a/lib/python/packagekit/client.py b/lib/python/packagekit/client.py
index 6eac96a..91f74c7 100644
--- a/lib/python/packagekit/client.py
+++ b/lib/python/packagekit/client.py
@@ -258,11 +258,11 @@ class PackageKitClient:
return self._run_transaction("SearchFile", [filters, search],
exit_handler)
- def install_packages(self, packages, exit_handler=None):
+ def install_packages(self, packages, only_trusted=True, exit_handler=None):
'''Install the packages of the given package ids'''
package_ids = self._to_package_id_list(packages)
- return self._run_transaction("InstallPackages", [package_ids],
- exit_handler)
+ return self._run_transaction("InstallPackages",
+ [only_trusted, package_ids], exit_handler)
def update_packages(self, packages, exit_handler=None):
'''Update the packages of the given package ids'''
commit 20bb7039c02e0d6088676588671b6889fd5e3aa7
Author: Richard Hughes <richard at hughsie.com>
Date: Fri Jan 8 18:53:23 2010 +0000
trivial: reduce the verbosity of the debugging in PkProc
diff --git a/src/pk-proc.c b/src/pk-proc.c
index 9bc3431..2c470a7 100644
--- a/src/pk-proc.c
+++ b/src/pk-proc.c
@@ -157,10 +157,8 @@ pk_proc_refresh_add_file (PkProc *proc, const gchar *pid_text, const gchar *path
/* parse PID */
ret = egg_strtoint (pid_text, &pid);
- if (!ret) {
- egg_warning ("failed to parse pid: '%s'", pid_text);
+ if (!ret)
goto out;
- }
/* get UID */
uid_file = g_build_filename ("/proc", pid_text, "loginuid", NULL);
@@ -176,10 +174,8 @@ pk_proc_refresh_add_file (PkProc *proc, const gchar *pid_text, const gchar *path
/* parse UID */
ret = egg_strtouint (contents, &uid);
- if (!ret) {
- egg_warning ("failed to parse uid: '%s' for %s", contents, pid_text);
+ if (!ret)
goto out;
- }
/* add data to array */
data = pk_proc_data_new (cmdline_full, pid, uid);
commit f0296a8a3503fc4322184a6e50be7a51fae5920b
Author: Richard Hughes <richard at hughsie.com>
Date: Fri Jan 8 15:53:40 2010 +0000
bugfix: when adopting a transaction ensure we set the role on the PkResults object
This fixes the require-restart icon in gnome-packagekit as it filters on the role after adopting
diff --git a/lib/packagekit-glib2/pk-client.c b/lib/packagekit-glib2/pk-client.c
index cdfdd7a..4baf3b0 100644
--- a/lib/packagekit-glib2/pk-client.c
+++ b/lib/packagekit-glib2/pk-client.c
@@ -3597,6 +3597,17 @@ pk_client_adopt_get_properties_cb (DBusGProxy *proxy, DBusGProxyCall *call, PkCl
g_hash_table_unref (hash);
}
+ /* this is the first time we'll know the actual role */
+ if (state->role == PK_ROLE_ENUM_UNKNOWN) {
+ g_object_get (state->progress,
+ "role", &state->role,
+ NULL);
+ /* proxy this */
+ g_object_set (state->results,
+ "role", state->role,
+ NULL);
+ }
+
/* we're waiting for finished */
}
commit 0405e7bb50af874cd864d4c38c9865f4a2bc6a5c
Author: Richard Hughes <richard at hughsie.com>
Date: Fri Jan 8 15:49:41 2010 +0000
trivial: remove some superflurious debugging in PkTransactionExtra
diff --git a/src/pk-transaction-extra.c b/src/pk-transaction-extra.c
index 5369c59..8a8e45e 100644
--- a/src/pk-transaction-extra.c
+++ b/src/pk-transaction-extra.c
@@ -780,23 +780,17 @@ pk_transaction_extra_get_uid (PkTransactionExtra *extra, guint pid)
gint uid = -1;
gchar *filename = NULL;
gchar *uid_text = NULL;
- GError *error = NULL;
/* get command line from proc */
filename = g_strdup_printf ("/proc/%i/loginuid", pid);
- ret = g_file_get_contents (filename, &uid_text, NULL, &error);
- if (!ret) {
- egg_warning ("failed to get loginuid: %s", error->message);
- g_error_free (error);
+ ret = g_file_get_contents (filename, &uid_text, NULL, NULL);
+ if (!ret)
goto out;
- }
/* convert from text */
ret = egg_strtoint (uid_text, &uid);
- if (!ret) {
- egg_warning ("failed to parse uid: '%s'", uid_text);
+ if (!ret)
goto out;
- }
out:
g_free (filename);
g_free (uid_text);
@@ -854,7 +848,7 @@ pk_transaction_extra_check_library_restart (PkTransactionExtra *extra)
else
cmdline_full = g_strdup_printf ("/usr/bin/%s", cmdline);
- egg_warning ("pid=%i: %s (%i)", pid, cmdline_full, uid);
+ egg_debug ("pid=%i: %s (%i)", pid, cmdline_full, uid);
if (uid < 500)
g_ptr_array_add (files_system, cmdline_full);
else
@@ -874,7 +868,7 @@ pk_transaction_extra_check_library_restart (PkTransactionExtra *extra)
package = pk_transaction_extra_get_installed_package_for_file (extra, filename);
if (package == NULL) {
- egg_warning ("failed to find package for %s", filename);
+ egg_debug ("failed to find package for %s", filename);
continue;
}
pk_transaction_extra_set_require_restart (extra, PK_RESTART_ENUM_SECURITY_SESSION, pk_package_get_id (package));
@@ -886,7 +880,7 @@ pk_transaction_extra_check_library_restart (PkTransactionExtra *extra)
package = pk_transaction_extra_get_installed_package_for_file (extra, filename);
if (package == NULL) {
- egg_warning ("failed to find package for %s", filename);
+ egg_debug ("failed to find package for %s", filename);
continue;
}
pk_transaction_extra_set_require_restart (extra, PK_RESTART_ENUM_SECURITY_SYSTEM, pk_package_get_id (package));
@@ -1099,7 +1093,7 @@ pk_transaction_extra_check_library_restart_pre (PkTransactionExtra *extra, gchar
/* nothing to do */
if (extra->priv->files_list->len == 0) {
- egg_warning ("no files");
+ egg_debug ("no files");
goto out;
}
@@ -1115,7 +1109,7 @@ pk_transaction_extra_check_library_restart_pre (PkTransactionExtra *extra, gchar
/* nothing depends on these libraries */
if (extra->priv->pids->len == 0) {
- egg_warning ("no processes depend on these libraries");
+ egg_debug ("no processes depend on these libraries");
goto out;
}
commit ba70f9ca039fe9a1c0f9d8fb537002bdfe020e59
Author: Richard Hughes <richard at hughsie.com>
Date: Fri Jan 8 15:35:37 2010 +0000
trivial: relax the make check parameters in PkDesktop so that it works on Fedora 13
diff --git a/lib/packagekit-glib2/pk-desktop.c b/lib/packagekit-glib2/pk-desktop.c
index fe72039..cad6ce8 100644
--- a/lib/packagekit-glib2/pk-desktop.c
+++ b/lib/packagekit-glib2/pk-desktop.c
@@ -394,7 +394,7 @@ pk_desktop_test (gpointer user_data)
array = pk_desktop_get_shown_for_package (desktop, "gnome-packagekit", NULL);
if (array == NULL)
egg_test_failed (test, "array NULL");
- else if (array->len == 5)
+ else if (array->len > 3)
egg_test_success (test, NULL);
else
egg_test_failed (test, "length=%i", array->len);
commit 7e02d09f397fbdfc6c9cda2840acfdd60f34c27b
Author: Richard Hughes <richard at hughsie.com>
Date: Fri Jan 8 15:35:01 2010 +0000
trivial: fix up make check as now the daemon can send a cancelled error message
diff --git a/lib/packagekit-glib2/pk-client.c b/lib/packagekit-glib2/pk-client.c
index 549a115..cdfdd7a 100644
--- a/lib/packagekit-glib2/pk-client.c
+++ b/lib/packagekit-glib2/pk-client.c
@@ -4199,7 +4199,8 @@ pk_client_test_search_name_cb (GObject *object, GAsyncResult *res, EggTest *test
error_code = pk_results_get_error_code (results);
if (pk_error_get_code (error_code) != PK_ERROR_ENUM_TRANSACTION_CANCELLED)
egg_test_failed (test, "failed to get error code: %i", pk_error_get_code (error_code));
- if (g_strcmp0 (pk_error_get_details (error_code), "The task was stopped successfully") != 0)
+ if (g_strcmp0 (pk_error_get_details (error_code), "The task was stopped successfully") != 0 &&
+ g_strcmp0 (pk_error_get_details (error_code), "transaction was cancelled") != 0)
egg_test_failed (test, "failed to get error message: %s", pk_error_get_details (error_code));
out:
if (error_code != NULL)
@@ -4238,7 +4239,7 @@ pk_client_test_progress_cb (PkProgress *progress, PkProgressType type, EggTest *
}
static gboolean
-pk_client_test_cancel (GCancellable *cancellable)
+pk_client_test_cancel_cb (GCancellable *cancellable)
{
egg_warning ("cancelling method");
g_cancellable_cancel (cancellable);
@@ -4503,7 +4504,7 @@ pk_client_test (gpointer user_data)
pk_client_search_names_async (client, pk_bitfield_value (PK_FILTER_ENUM_NONE), values, cancellable,
(PkProgressCallback) pk_client_test_progress_cb, test,
(GAsyncReadyCallback) pk_client_test_search_name_cb, test);
- g_timeout_add (1000, (GSourceFunc) pk_client_test_cancel, cancellable);
+ g_timeout_add (1000, (GSourceFunc) pk_client_test_cancel_cb, cancellable);
egg_test_loop_wait (test, 15000);
egg_test_success (test, "cancelled in %i", egg_test_elapsed (test));
commit 99a53be9027eefbb0a8bc35294b2fdd04f330191
Author: Richard Hughes <richard at hughsie.com>
Date: Fri Jan 8 15:33:34 2010 +0000
Ensure PkProgress sends ::notify signals when properties change
diff --git a/lib/packagekit-glib2/pk-progress.c b/lib/packagekit-glib2/pk-progress.c
index 9f889aa..5951dbe 100644
--- a/lib/packagekit-glib2/pk-progress.c
+++ b/lib/packagekit-glib2/pk-progress.c
@@ -158,6 +158,8 @@ pk_progress_set_package_id (PkProgress *progress, const gchar *package_id)
g_free (progress->priv->package_id);
progress->priv->package_id = g_strdup (package_id);
egg_debug ("package_id now %s", package_id);
+ g_object_notify (G_OBJECT(progress), "package-id");
+
return TRUE;
}
@@ -178,6 +180,8 @@ pk_progress_set_transaction_id (PkProgress *progress, const gchar *transaction_i
g_free (progress->priv->transaction_id);
progress->priv->transaction_id = g_strdup (transaction_id);
egg_debug ("transaction_id now %s", transaction_id);
+ g_object_notify (G_OBJECT(progress), "transaction-id");
+
return TRUE;
}
@@ -196,6 +200,8 @@ pk_progress_set_percentage (PkProgress *progress, gint percentage)
/* new value */
progress->priv->percentage = percentage;
egg_debug ("percentage now %i", percentage);
+ g_object_notify (G_OBJECT(progress), "percentage");
+
return TRUE;
}
@@ -214,6 +220,8 @@ pk_progress_set_subpercentage (PkProgress *progress, gint subpercentage)
/* new value */
progress->priv->subpercentage = subpercentage;
egg_debug ("subpercentage now %i", subpercentage);
+ g_object_notify (G_OBJECT(progress), "subpercentage");
+
return TRUE;
}
@@ -232,6 +240,8 @@ pk_progress_set_status (PkProgress *progress, PkStatusEnum status)
/* new value */
progress->priv->status = status;
egg_debug ("status now %s", pk_status_enum_to_text (status));
+ g_object_notify (G_OBJECT(progress), "status");
+
return TRUE;
}
@@ -250,6 +260,8 @@ pk_progress_set_role (PkProgress *progress, PkRoleEnum role)
/* new value */
progress->priv->role = role;
egg_debug ("role now %s", pk_role_enum_to_text (role));
+ g_object_notify (G_OBJECT(progress), "role");
+
return TRUE;
}
@@ -268,6 +280,8 @@ pk_progress_set_allow_cancel (PkProgress *progress, gboolean allow_cancel)
/* new value */
progress->priv->allow_cancel = allow_cancel;
egg_debug ("allow-cancel now %i", allow_cancel);
+ g_object_notify (G_OBJECT(progress), "allow-cancel");
+
return TRUE;
}
@@ -286,6 +300,8 @@ pk_progress_set_caller_active (PkProgress *progress, gboolean caller_active)
/* new value */
progress->priv->caller_active = caller_active;
egg_debug ("caller-active now %i", caller_active);
+ g_object_notify (G_OBJECT(progress), "caller-active");
+
return TRUE;
}
@@ -304,6 +320,8 @@ pk_progress_set_elapsed_time (PkProgress *progress, guint elapsed_time)
/* new value */
progress->priv->elapsed_time = elapsed_time;
egg_debug ("elapsed time now %i", elapsed_time);
+ g_object_notify (G_OBJECT(progress), "elapsed-time");
+
return TRUE;
}
@@ -322,6 +340,8 @@ pk_progress_set_remaining_time (PkProgress *progress, guint remaining_time)
/* new value */
progress->priv->remaining_time = remaining_time;
egg_debug ("remaining time now %i", remaining_time);
+ g_object_notify (G_OBJECT(progress), "remaining-time");
+
return TRUE;
}
@@ -340,6 +360,8 @@ pk_progress_set_speed (PkProgress *progress, guint speed)
/* new value */
progress->priv->speed = speed;
egg_debug ("speed now %i", speed);
+ g_object_notify (G_OBJECT(progress), "speed");
+
return TRUE;
}
@@ -358,6 +380,8 @@ pk_progress_set_uid (PkProgress *progress, guint uid)
/* new value */
progress->priv->uid = uid;
egg_debug ("uid now %i", uid);
+ g_object_notify (G_OBJECT(progress), "uid");
+
return TRUE;
}
@@ -378,6 +402,8 @@ pk_progress_set_package (PkProgress *progress, PkPackage *package)
g_object_unref (progress->priv->package);
progress->priv->package = g_object_ref (package);
egg_debug ("package now %p", package);
+ g_object_notify (G_OBJECT(progress), "package");
+
return TRUE;
}
commit 22958d80ddf50573006eef06a3c5f1636df4cc7d
Author: Richard Hughes <richard at hughsie.com>
Date: Fri Jan 8 15:32:56 2010 +0000
trivial: remove two warning statements left in by accident
diff --git a/lib/packagekit-glib2/pk-transaction-list.c b/lib/packagekit-glib2/pk-transaction-list.c
index 740525e..d9000a5 100644
--- a/lib/packagekit-glib2/pk-transaction-list.c
+++ b/lib/packagekit-glib2/pk-transaction-list.c
@@ -341,14 +341,14 @@ out:
static void
pk_transaction_list_test_added_cb (PkTransactionList *tlist, const gchar *tid, EggTest *test)
{
- egg_warning ("added %s", tid);
+ egg_debug ("added %s", tid);
_added++;
}
static void
pk_transaction_list_test_removed_cb (PkTransactionList *tlist, const gchar *tid, EggTest *test)
{
- egg_warning ("removed %s", tid);
+ egg_debug ("removed %s", tid);
_removed++;
}
More information about the PackageKit-commit
mailing list