468cb5980b
Since GNOME version is now 40, it no longer makes sense to use the old attribute name.
62 lines
2.4 KiB
Diff
62 lines
2.4 KiB
Diff
From 1ae0eca39ba6af27f37e2fe81395b91a2761a408 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <1ae0eca39ba6af27f37e2fe81395b91a2761a408.1600627676.git-series.worldofpeace@protonmail.ch>
|
|
From: WORLDofPEACE <worldofpeace@protonmail.ch>
|
|
Date: Sun, 20 Sep 2020 14:46:59 -0400
|
|
Subject: [PATCH] fix paths
|
|
|
|
---
|
|
gnome-initial-setup/pages/keyboard/cc-input-chooser.c | 6 +++---
|
|
gnome-initial-setup/pages/timezone/tz.h | 4 ++--
|
|
3 files changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c b/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
|
|
index 196abf6..613d0e5 100644
|
|
--- a/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
|
|
+++ b/gnome-initial-setup/pages/keyboard/cc-input-chooser.c
|
|
@@ -177,9 +177,9 @@ preview_cb (GtkLabel *label,
|
|
return TRUE;
|
|
|
|
if (variant[0])
|
|
- commandline = g_strdup_printf ("gkbd-keyboard-display -l \"%s\t%s\"", layout, variant);
|
|
+ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l \"%s\t%s\"", layout, variant);
|
|
else
|
|
- commandline = g_strdup_printf ("gkbd-keyboard-display -l %s", layout);
|
|
+ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l %s", layout);
|
|
g_spawn_command_line_async (commandline, NULL);
|
|
g_free (commandline);
|
|
|
|
@@ -831,7 +831,7 @@ cc_input_chooser_class_init (CcInputChooserClass *klass)
|
|
g_param_spec_string ("showing-extra", "", "", "",
|
|
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
|
|
|
|
- signals[CHANGED] =
|
|
+ signals[CHANGED] =
|
|
g_signal_new ("changed",
|
|
G_TYPE_FROM_CLASS (object_class),
|
|
G_SIGNAL_RUN_FIRST,
|
|
diff --git a/gnome-initial-setup/pages/timezone/tz.h b/gnome-initial-setup/pages/timezone/tz.h
|
|
index a2376f8..5cb7bc9 100644
|
|
--- a/gnome-initial-setup/pages/timezone/tz.h
|
|
+++ b/gnome-initial-setup/pages/timezone/tz.h
|
|
@@ -4,7 +4,7 @@
|
|
* Copyright (C) 2000-2001 Ximian, Inc.
|
|
*
|
|
* Authors: Hans Petter Jansson <hpj@ximian.com>
|
|
- *
|
|
+ *
|
|
* Largely based on Michael Fulbright's work on Anaconda.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
@@ -28,7 +28,7 @@
|
|
G_BEGIN_DECLS
|
|
|
|
#ifndef __sun
|
|
-# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
|
|
+# define TZ_DATA_FILE "@tzdata@/share/zoneinfo/zone.tab"
|
|
#else
|
|
# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab"
|
|
#endif
|
|
|
|
base-commit: 5132e206a6bf81964450561d68473ac015760455
|
|
--
|
|
git-series 0.9.1
|