@@ -1,26 +1,26 @@
11diff --git a/panels/color/cc-color-panel.c b/panels/color/cc-color-panel.c
2−index 49ca35220..adefb87b9 100644
2+index 603178efc..c363a6a5c 100644
33--- a/panels/color/cc-color-panel.c
44+++ b/panels/color/cc-color-panel.c
5−@@ -599,7 +599,7 @@ gcm_prefs_calibrate_cb (GtkWidget *widget, CcColorPanel *prefs)
5+@@ -591,7 +591,7 @@ gcm_prefs_calibrate_cb (CcColorPanel *prefs)
66
77 /* run with modal set */
88 argv = g_ptr_array_new_with_free_func (g_free);
9−- g_ptr_array_add (argv, g_build_filename (BINDIR, "gcm-calibrate", NULL));
9+- g_ptr_array_add (argv, g_strdup ("gcm-calibrate"));
1010+ g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-calibrate", NULL));
1111 g_ptr_array_add (argv, g_strdup ("--device"));
1212 g_ptr_array_add (argv, g_strdup (cd_device_get_id (prefs->current_device)));
1313 g_ptr_array_add (argv, g_strdup ("--parent-window"));
14−@@ -1038,7 +1038,7 @@ gcm_prefs_profile_view (CcColorPanel *prefs, CdProfile *profile)
14+@@ -1029,7 +1029,7 @@ gcm_prefs_profile_view (CcColorPanel *prefs, CdProfile *profile)
1515
1616 /* open up gcm-viewer as a info pane */
1717 argv = g_ptr_array_new_with_free_func (g_free);
18−- g_ptr_array_add (argv, g_build_filename (BINDIR, "gcm-viewer", NULL));
18+- g_ptr_array_add (argv, g_strdup ("gcm-viewer"));
1919+ g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-viewer", NULL));
2020 g_ptr_array_add (argv, g_strdup ("--profile"));
2121 g_ptr_array_add (argv, g_strdup (cd_profile_get_id (profile)));
2222 g_ptr_array_add (argv, g_strdup ("--parent-window"));
23−@@ -1288,15 +1288,12 @@ gcm_prefs_device_clicked (CcColorPanel *prefs, CdDevice *device)
23+@@ -1275,15 +1275,12 @@ gcm_prefs_device_clicked (CcColorPanel *prefs, CdDevice *device)
2424 static void
2525 gcm_prefs_profile_clicked (CcColorPanel *prefs, CdProfile *profile, CdDevice *device)
2626 {
@@ -38,12 +38,12 @@ index 49ca35220..adefb87b9 100644
3838 else
3939 gtk_widget_set_sensitive (prefs->toolbutton_profile_view, FALSE);
4040diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h
41−index 96b25140c..1ad704d4a 100644
41+index a2376f8a4..98769e08f 100644
4242--- a/panels/datetime/tz.h
4343+++ b/panels/datetime/tz.h
4444@@ -27,11 +27,7 @@
4545
46− #include <glib.h>
46+ G_BEGIN_DECLS
4747
4848-#ifndef __sun
4949-# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
@@ -55,25 +55,42 @@ index 96b25140c..1ad704d4a 100644
5555 typedef struct _TzDB TzDB;
5656 typedef struct _TzLocation TzLocation;
5757diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c
58−index 4541986db..da7826bfe 100644
58+index bd0e07762..0e71351f8 100644
5959--- a/panels/info-overview/cc-info-overview-panel.c
6060+++ b/panels/info-overview/cc-info-overview-panel.c
61−@@ -169,7 +169,7 @@ load_gnome_version (char **version,
61+@@ -172,7 +172,7 @@ load_gnome_version (char **version,
6262 gsize length;
6363 g_autoptr(VersionData) data = NULL;
64−
64+
6565- if (!g_file_get_contents (DATADIR "/gnome/gnome-version.xml",
6666+ if (!g_file_get_contents ("@gnome_desktop@/share/gnome/gnome-version.xml",
6767 &contents,
6868 &length,
6969 &error))
70+diff --git a/panels/keyboard/cc-input-list-box.c b/panels/keyboard/cc-input-list-box.c
71+index 6c2cb5614..8f57159cc 100644
72+--- a/panels/keyboard/cc-input-list-box.c
73++++ b/panels/keyboard/cc-input-list-box.c
74+@@ -223,10 +223,10 @@ row_layout_cb (CcInputListBox *self,
75+ layout_variant = cc_input_source_get_layout_variant (source);
76+
77+ if (layout_variant && layout_variant[0])
78+- commandline = g_strdup_printf ("gkbd-keyboard-display -l \"%s\t%s\"",
79++ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l \"%s\t%s\"",
80+ layout, layout_variant);
81+ else
82+- commandline = g_strdup_printf ("gkbd-keyboard-display -l %s",
83++ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l %s",
84+ layout);
85+
86+ g_spawn_command_line_async (commandline, NULL);
7087diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/network/connection-editor/net-connection-editor.c
71−index 9390a3308..d30b4a68e 100644
88+index 505b8ee25..62e94009f 100644
7289--- a/panels/network/connection-editor/net-connection-editor.c
7390+++ b/panels/network/connection-editor/net-connection-editor.c
74−@@ -278,9 +278,9 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type)
91+@@ -267,9 +267,9 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type)
7592 g_autoptr(GError) error = NULL;
76−
93+
7794 if (self->is_new_connection) {
7895- cmdline = g_strdup_printf ("nm-connection-editor --type='%s' --create", type);
7996+ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --type='%s' --create", type);
@@ -84,19 +101,20 @@ index 9390a3308..d30b4a68e 100644
84101 }
85102
86103diff --git a/panels/network/net-device-bluetooth.c b/panels/network/net-device-bluetooth.c
104+index 74dfb0e9a..5f53d1a20 100644
87105--- a/panels/network/net-device-bluetooth.c
88106+++ b/panels/network/net-device-bluetooth.c
89107@@ -90,7 +90,7 @@ nm_device_bluetooth_refresh_ui (NetDeviceBluetooth *self)
90108 update_off_switch_from_device_state (self->device_off_switch, state, self);
91−
109+
92110 /* set up the Options button */
93111- path = g_find_program_in_path ("nm-connection-editor");
94112+ path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor");
95113 gtk_widget_set_visible (GTK_WIDGET (self->options_button), state != NM_DEVICE_STATE_UNMANAGED && path != NULL);
96114 }
97−
115+
98116@@ -141,7 +141,7 @@ options_button_clicked_cb (NetDeviceBluetooth *self)
99−
117+
100118 connection = net_device_get_find_connection (self->client, self->device);
101119 uuid = nm_connection_get_uuid (connection);
102120- cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid);
@@ -105,19 +123,20 @@ diff --git a/panels/network/net-device-bluetooth.c b/panels/network/net-device-b
105123 if (!g_spawn_command_line_async (cmdline, &error))
106124 g_warning ("Failed to launch nm-connection-editor: %s", error->message);
107125@@ -185,7 +185,7 @@ net_device_bluetooth_init (NetDeviceBluetooth *self)
108−
126+
109127 gtk_widget_init_template (GTK_WIDGET (self));
110−
128+
111129- path = g_find_program_in_path ("nm-connection-editor");
112130+ path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor");
113131 gtk_widget_set_visible (GTK_WIDGET (self->options_button), path != NULL);
114132 }
115−
133+
116134diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobile.c
135+index 34eb86241..50d0a2bed 100644
117136--- a/panels/network/net-device-mobile.c
118137+++ b/panels/network/net-device-mobile.c
119−@@ -484,7 +484,7 @@ options_button_clicked_cb (NetDeviceMobile *self)
120−
138+@@ -508,7 +508,7 @@ options_button_clicked_cb (NetDeviceMobile *self)
139+
121140 connection = net_device_get_find_connection (self->client, self->device);
122141 uuid = nm_connection_get_uuid (connection);
123142- cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid);
@@ -125,21 +144,21 @@ diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobi
125144 g_debug ("Launching '%s'\n", cmdline);
126145 if (!g_spawn_command_line_async (cmdline, &error))
127146 g_warning ("Failed to launch nm-connection-editor: %s", error->message);
128−@@ -776,7 +776,7 @@ net_device_mobile_init (NetDeviceMobile *self)
129−
147+@@ -797,7 +797,7 @@ net_device_mobile_init (NetDeviceMobile *self)
148+
130149 self->cancellable = g_cancellable_new ();
131−
150+
132151- path = g_find_program_in_path ("nm-connection-editor");
133152+ path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor");
134153 gtk_widget_set_visible (GTK_WIDGET (self->options_button), path != NULL);
135154 }
136−
155+
137156diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c
138−index f53ba217e..d24bcaeb9 100644
157+index a31a606e3..ed5133d29 100644
139158--- a/panels/printers/pp-host.c
140159+++ b/panels/printers/pp-host.c
141160@@ -256,7 +256,7 @@ _pp_host_get_snmp_devices_thread (GTask *task,
142− devices = g_new0 (PpDevicesList, 1);
161+ devices = g_ptr_array_new_with_free_func (g_object_unref);
143162
144163 argv = g_new0 (gchar *, 3);
145164- argv[0] = g_strdup ("/usr/lib/cups/backend/snmp");
@@ -147,25 +166,8 @@ index f53ba217e..d24bcaeb9 100644
147166 argv[1] = g_strdup (priv->hostname);
148167
149168 /* Use SNMP to get printer's informations */
150−diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c
151−index 35859526d..21486c917 100644
152−--- a/panels/region/cc-region-panel.c
153−+++ b/panels/region/cc-region-panel.c
154−@@ -755,10 +755,10 @@ row_layout_cb (CcRegionPanel *self,
155− layout_variant = cc_input_source_get_layout_variant (source);
156−
157− if (layout_variant && layout_variant[0])
158−- commandline = g_strdup_printf ("gkbd-keyboard-display -l \"%s\t%s\"",
159−+ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l \"%s\t%s\"",
160− layout, layout_variant);
161− else
162−- commandline = g_strdup_printf ("gkbd-keyboard-display -l %s",
163−+ commandline = g_strdup_printf ("@libgnomekbd@/bin/gkbd-keyboard-display -l %s",
164− layout);
165−
166− g_spawn_command_line_async (commandline, NULL);
167169diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c
168−index 00239ce0f..617c98870 100644
170+index 86f53d4fc..0b052856f 100644
169171--- a/panels/user-accounts/run-passwd.c
170172+++ b/panels/user-accounts/run-passwd.c
171173@@ -150,7 +150,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error)