diff options
Diffstat (limited to 'pkgs/desktops/gnome/core/gnome-control-center/paths.patch')
| -rw-r--r-- | pkgs/desktops/gnome/core/gnome-control-center/paths.patch | 49 |
1 files changed, 9 insertions, 40 deletions
diff --git a/pkgs/desktops/gnome/core/gnome-control-center/paths.patch b/pkgs/desktops/gnome/core/gnome-control-center/paths.patch index be2ca4b5e09e6..41dd5979aa4bc 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/paths.patch +++ b/pkgs/desktops/gnome/core/gnome-control-center/paths.patch @@ -37,10 +37,10 @@ index f6c84e3d2..cd897f8f5 100644 gtk_widget_set_sensitive (self->toolbutton_profile_view, TRUE); else gtk_widget_set_sensitive (self->toolbutton_profile_view, FALSE); -diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h +diff --git a/panels/system/datetime/tz.h b/panels/system/datetime/tz.h index feef16580..4b88ef7b1 100644 ---- a/panels/datetime/tz.h -+++ b/panels/datetime/tz.h +--- a/panels/system/datetime/tz.h ++++ b/panels/system/datetime/tz.h @@ -27,11 +27,7 @@ G_BEGIN_DECLS @@ -67,37 +67,6 @@ index ec5a905a5..689fdbebe 100644 if (self->is_new_connection) { g_autofree gchar *type_str = NULL; -diff --git a/panels/network/net-device-bluetooth.c b/panels/network/net-device-bluetooth.c -index 303f4a8af..e5afc4dff 100644 ---- a/panels/network/net-device-bluetooth.c -+++ b/panels/network/net-device-bluetooth.c -@@ -80,7 +80,7 @@ nm_device_bluetooth_refresh_ui (NetDeviceBluetooth *self) - update_off_switch_from_device_state (self->device_off_switch, state, self); - - /* set up the Options button */ -- path = g_find_program_in_path ("nm-connection-editor"); -+ path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor"); - gtk_widget_set_visible (GTK_WIDGET (self->options_button), state != NM_DEVICE_STATE_UNMANAGED && path != NULL); - } - -@@ -131,7 +131,7 @@ options_button_clicked_cb (NetDeviceBluetooth *self) - - connection = net_device_get_find_connection (self->client, self->device); - uuid = nm_connection_get_uuid (connection); -- cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid); -+ cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit %s", uuid); - g_debug ("Launching '%s'\n", cmdline); - if (!g_spawn_command_line_async (cmdline, &error)) - g_warning ("Failed to launch nm-connection-editor: %s", error->message); -@@ -173,7 +173,7 @@ net_device_bluetooth_init (NetDeviceBluetooth *self) - - gtk_widget_init_template (GTK_WIDGET (self)); - -- path = g_find_program_in_path ("nm-connection-editor"); -+ path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor"); - gtk_widget_set_visible (GTK_WIDGET (self->options_button), path != NULL); - } - diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobile.c index 166670224..36f720d36 100644 --- a/panels/network/net-device-mobile.c @@ -133,10 +102,10 @@ index a31a606e3..ed5133d29 100644 argv[1] = g_strdup (priv->hostname); /* Use SNMP to get printer's informations */ -diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c +diff --git a/panels/system/users/run-passwd.c b/panels/system/users/run-passwd.c index edbc99830..1e1d90141 100644 ---- a/panels/user-accounts/run-passwd.c -+++ b/panels/user-accounts/run-passwd.c +--- a/panels/system/users/run-passwd.c ++++ b/panels/system/users/run-passwd.c @@ -152,7 +152,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error) gchar **envp; gint my_stdin, my_stdout; @@ -146,10 +115,10 @@ index edbc99830..1e1d90141 100644 argv[1] = NULL; envp = g_get_environ (); -diff --git a/panels/user-accounts/user-utils.c b/panels/user-accounts/user-utils.c +diff --git a/panels/system/users/user-utils.c b/panels/system/users/user-utils.c index 5b7bc1f02..13ffe6ca8 100644 ---- a/panels/user-accounts/user-utils.c -+++ b/panels/user-accounts/user-utils.c +--- a/panels/system/users/user-utils.c ++++ b/panels/system/users/user-utils.c @@ -215,7 +215,7 @@ is_valid_username_async (const gchar *username, * future, so it would be nice to have some official way for this * instead of relying on the current "--login" implementation. |