[gnome-initial-setup] Revert "summary-page: Install language packs"
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-initial-setup] Revert "summary-page: Install language packs"
- Date: Wed, 24 Apr 2013 16:07:28 +0000 (UTC)
commit 1392be5c57b24519d5042228ec0848a790d332b2
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Wed Apr 24 12:07:18 2013 -0400
Revert "summary-page: Install language packs"
This reverts commit 0d36baf38edba7d625bafea7078215d40c58f812.
Committed by accident.
.gitignore | 1 -
gnome-initial-setup/pages/summary/Makefile.am | 7 -
.../pages/summary/gis-summary-page.c | 56 --
.../pages/summary/org.freedesktop.PackageKit.xml | 546 --------------------
4 files changed, 0 insertions(+), 610 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 80575a1..2f0fbbd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,7 +58,6 @@ gnome-initial-setup/pages/location/cc-datetime-resources.[ch]
gnome-initial-setup/pages/location/location-resources.[ch]
gnome-initial-setup/pages/goa/goa-resources.[ch]
gnome-initial-setup/pages/summary/summary-resources.[ch]
-gnome-initial-setup/pages/summary/pk.[ch]
gnome-initial-setup-first-login.desktop
gnome-initial-setup.desktop
diff --git a/gnome-initial-setup/pages/summary/Makefile.am b/gnome-initial-setup/pages/summary/Makefile.am
index c93ee77..d716355 100644
--- a/gnome-initial-setup/pages/summary/Makefile.am
+++ b/gnome-initial-setup/pages/summary/Makefile.am
@@ -8,13 +8,6 @@ AM_CPPFLAGS = \
BUILT_SOURCES =
-pk.c: pk.h
-pk.h: $(srcdir)/org.freedesktop.PackageKit.xml
- $(AM_V_GEN) gdbus-codegen \
- --interface-prefix org.freedesktop. \
- --generate-c-code pk $<
-BUILT_SOURCES += pk.c pk.h
-
resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies
$(srcdir)/summary.gresource.xml)
summary-resources.c: summary.gresource.xml $(resource_files)
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $<
diff --git a/gnome-initial-setup/pages/summary/gis-summary-page.c
b/gnome-initial-setup/pages/summary/gis-summary-page.c
index a9965d0..cdf1e1b 100644
--- a/gnome-initial-setup/pages/summary/gis-summary-page.c
+++ b/gnome-initial-setup/pages/summary/gis-summary-page.c
@@ -32,7 +32,6 @@
#include <glib/gstdio.h>
#include <glib/gi18n.h>
#include <gio/gio.h>
-#include <locale.h>
#include <stdlib.h>
#include <errno.h>
@@ -40,11 +39,6 @@
#include <gdm/gdm-client.h>
-#define GNOME_DESKTOP_USE_UNSTABLE_API
-#include <libgnome-desktop/gnome-languages.h>
-
-#include "pk.h"
-
#define SERVICE_NAME "gdm-password"
G_DEFINE_TYPE (GisSummaryPage, gis_summary_page, GIS_TYPE_PAGE);
@@ -218,54 +212,6 @@ add_setup_done_file (void)
g_free (gis_done_path);
}
-static gchar *
-getting_started_package_name (void)
-{
- gchar *lc = setlocale (LC_MESSAGES, NULL);
- gchar *locale = gnome_normalize_locale (lc);
- gchar *package_name;
-
- if (strcmp (locale, "en"))
- package_name = g_strdup ("gnome-getting-started-docs");
- else
- package_name = g_strdup_printf ("gnome-getting-started-docs-%s", locale);
-
- g_free (locale);
- return package_name;
-}
-
-static void
-download_language_pack (GisSummaryPage *page)
-{
- gchar *package_name = getting_started_package_name ();
- gchar *package_names[2] = { package_name, NULL };
- PackageKitModify *proxy;
- GError *error = NULL;
-
- proxy = package_kit_modify_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
- G_DBUS_PROXY_FLAGS_NONE,
- "org.freedesktop.PackageKit",
- "/org/freedesktop/PackageKit",
- NULL, NULL);
-
- if (!package_kit_modify_call_install_package_names_sync (proxy,
- 0,
- (const gchar *const *) package_names,
-
"hide-confirm-search,hide-confirm-deps,hide-confirm-install,hide-progress,hide-finished,hide-warning",
- NULL, &error)) {
-
- /* we need to get a better api than this broken pile of trash */
- if (!(g_dbus_error_is_remote_error (error) &&
- g_strcmp0 (g_dbus_error_get_remote_error (error), "org.freedesktop.PackageKit.Modify.Failed") == 0
&&
- g_dbus_error_strip_remote_error (error) &&
- g_strcmp0 (error->message, "package already found") == 0))
- g_warning ("Error installing packages: %s", error->message);
- }
-
- g_clear_error (&error);
- g_free (package_name);
-}
-
static void
done_cb (GtkButton *button, GisSummaryPage *page)
{
@@ -300,8 +246,6 @@ prepare_cb (GisAssistant *assistant,
gis_driver_get_user_permissions (GIS_PAGE (this_page)->driver,
&priv->user_account,
&priv->user_password);
-
- download_language_pack (this_page);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]