|
16893
|
1 |
diff -urN -x '*.orig' -x '*.rej' gnomecc.orig/capplets/accessibility/at-properties/main.c gnomecc.new/capplets/accessibility/at-properties/main.c
|
|
|
2 |
--- gnomecc.orig/capplets/accessibility/at-properties/main.c 2009-10-30 14:09:58.677822645 +0000
|
|
|
3 |
+++ gnomecc.new/capplets/accessibility/at-properties/main.c 2009-10-30 14:10:14.795670128 +0000
|
|
16725
|
4 |
@@ -18,12 +18,29 @@
|
|
|
5 |
#include "capplet-util.h"
|
|
|
6 |
#include "gconf-property-editor.h"
|
|
|
7 |
#include "activate-settings-daemon.h"
|
|
|
8 |
+#include <zone.h>
|
|
|
9 |
|
|
|
10 |
#define ACCESSIBILITY_KEY "/desktop/gnome/interface/accessibility"
|
|
|
11 |
#define ACCESSIBILITY_KEY_DIR "/desktop/gnome/interface"
|
|
|
12 |
|
|
|
13 |
static gboolean initial_state;
|
|
|
14 |
|
|
|
15 |
+static gboolean
|
|
|
16 |
+tx_session ()
|
|
|
17 |
+{
|
|
|
18 |
+ static int ret = -1;
|
|
|
19 |
+
|
|
|
20 |
+ if (ret == -1) {
|
|
|
21 |
+ if (getzoneid () == 0 && getenv ("TRUSTED_SESSION")) {
|
|
|
22 |
+ ret = 1;
|
|
|
23 |
+ } else {
|
|
|
24 |
+ ret = 0;
|
|
|
25 |
+ }
|
|
|
26 |
+ }
|
|
|
27 |
+
|
|
|
28 |
+ return ret ? TRUE : FALSE;
|
|
|
29 |
+}
|
|
|
30 |
+
|
|
|
31 |
static GtkBuilder *
|
|
|
32 |
create_builder (void)
|
|
|
33 |
{
|
|
|
34 |
@@ -54,6 +71,12 @@
|
|
|
35 |
}
|
|
|
36 |
|
|
|
37 |
g_free (prog);
|
|
|
38 |
+
|
|
|
39 |
+ if (tx_session ()) {
|
|
|
40 |
+ object = gtk_builder_get_object (builder,
|
|
|
41 |
+ "at_pref_button");
|
|
|
42 |
+ gtk_widget_hide (GTK_WIDGET (object));
|
|
|
43 |
+ }
|
|
|
44 |
} else {
|
|
|
45 |
g_warning ("Could not load UI: %s", error->message);
|
|
|
46 |
g_error_free (error);
|
|
16893
|
47 |
diff -urN -x '*.orig' -x '*.rej' gnomecc.orig/capplets/appearance/appearance-desktop.c gnomecc.new/capplets/appearance/appearance-desktop.c
|
|
|
48 |
--- gnomecc.orig/capplets/appearance/appearance-desktop.c 2009-10-30 14:09:58.653599709 +0000
|
|
|
49 |
+++ gnomecc.new/capplets/appearance/appearance-desktop.c 2009-10-30 14:10:26.173294668 +0000
|
|
|
50 |
@@ -31,6 +31,8 @@
|
|
|
51 |
#include <libgnomeui/gnome-desktop-thumbnail.h>
|
|
|
52 |
#include <libgnomeui/gnome-bg.h>
|
|
|
53 |
|
|
|
54 |
+#include <tsol/label.h>
|
|
|
55 |
+
|
|
|
56 |
enum {
|
|
|
57 |
TARGET_URI_LIST,
|
|
|
58 |
TARGET_BGIMAGE
|
|
|
59 |
@@ -1162,7 +1164,7 @@
|
|
|
60 |
|
|
|
61 |
w = appearance_capplet_get_widget (data, "more_backgrounds_linkbutton");
|
|
|
62 |
url = gconf_client_get_string (data->client, MORE_BACKGROUNDS_URL_KEY, NULL);
|
|
|
63 |
- if (url != NULL && url[0] != '\0') {
|
|
|
64 |
+ if (!is_system_labeled () && url != NULL && url[0] != '\0') {
|
|
|
65 |
gtk_link_button_set_uri (GTK_LINK_BUTTON (w), url);
|
|
|
66 |
gtk_widget_show (w);
|
|
|
67 |
} else {
|
|
|
68 |
diff -urN -x '*.orig' -x '*.rej' gnomecc.orig/capplets/appearance/appearance-themes.c gnomecc.new/capplets/appearance/appearance-themes.c
|
|
|
69 |
--- gnomecc.orig/capplets/appearance/appearance-themes.c 2009-10-30 14:09:58.651652280 +0000
|
|
|
70 |
+++ gnomecc.new/capplets/appearance/appearance-themes.c 2009-10-30 14:10:26.174570283 +0000
|
|
|
71 |
@@ -33,6 +33,8 @@
|
|
|
72 |
#include <string.h>
|
|
|
73 |
#include <libgnomeui/gnome-desktop-thumbnail.h>
|
|
|
74 |
|
|
|
75 |
+#include <tsol/label.h>
|
|
|
76 |
+
|
|
|
77 |
#define CUSTOM_THEME_NAME "__custom__"
|
|
|
78 |
|
|
|
79 |
enum
|
|
|
80 |
@@ -1130,7 +1132,7 @@
|
|
|
81 |
|
|
|
82 |
w = appearance_capplet_get_widget (data, "more_themes_linkbutton");
|
|
|
83 |
url = gconf_client_get_string (data->client, MORE_THEMES_URL_KEY, NULL);
|
|
|
84 |
- if (url != NULL && url[0] != '\0') {
|
|
|
85 |
+ if (!is_system_labeled () && url != NULL && url[0] != '\0') {
|
|
|
86 |
gtk_link_button_set_uri (GTK_LINK_BUTTON (w), url);
|
|
|
87 |
gtk_widget_show (w);
|
|
|
88 |
} else {
|