summaryrefslogtreecommitdiff
path: root/capplets/default-applications
diff options
context:
space:
mode:
authorrbuj <[email protected]>2019-06-13 23:41:47 +0200
committerraveit65 <[email protected]>2019-06-15 17:24:06 +0200
commit0155e265fad7655d705ca1ca9c9552d456699a3a (patch)
tree3e7df39a14b201cc6d7dde491fd0400036eef542 /capplets/default-applications
parent06970a77f4d1d7aefd9b468a4ac75f737ebf5431 (diff)
downloadmate-control-center-0155e265fad7655d705ca1ca9c9552d456699a3a.tar.bz2
mate-control-center-0155e265fad7655d705ca1ca9c9552d456699a3a.tar.xz
Add orca to Visual combo box if available
Fixes #270
Diffstat (limited to 'capplets/default-applications')
-rw-r--r--capplets/default-applications/mate-da-capplet.c12
-rw-r--r--capplets/default-applications/mate-da-capplet.h4
2 files changed, 13 insertions, 3 deletions
diff --git a/capplets/default-applications/mate-da-capplet.c b/capplets/default-applications/mate-da-capplet.c
index 56743521..386765b2 100644
--- a/capplets/default-applications/mate-da-capplet.c
+++ b/capplets/default-applications/mate-da-capplet.c
@@ -668,7 +668,13 @@ show_dialog(MateDACapplet* capplet, const gchar* start_page)
capplet->spreadsheet_editors = g_app_info_get_all_for_type("application/vnd.ms-excel");
capplet->visual_ats = NULL;
- capplet->visual_ats = fill_list_from_desktop_file (capplet->visual_ats, APPLICATIONSDIR "/orca.desktop");
+ const gchar *const *sys_config_dirs = g_get_system_config_dirs();
+ for (const gchar* c = *sys_config_dirs; c; c=*++sys_config_dirs)
+ {
+ gchar* path = g_strconcat (c, "/autostart/orca-autostart.desktop", NULL);
+ capplet->visual_ats = fill_list_from_desktop_file (capplet->visual_ats, path);
+ g_free (path);
+ }
capplet->visual_ats = g_list_reverse (capplet->visual_ats);
capplet->mobility_ats = NULL;
@@ -760,7 +766,7 @@ show_dialog(MateDACapplet* capplet, const gchar* start_page)
g_signal_connect(capplet->messenger_combo_box, "changed", G_CALLBACK(messenger_combo_changed_cb), capplet);
g_settings_bind (capplet->mobility_settings, MOBILITY_STARTUP_KEY, capplet->mobility_startup_checkbutton, "active", G_SETTINGS_BIND_DEFAULT);
- g_settings_bind (capplet->visual_settings, VISUAL_STARTUP_KEY, capplet->visual_startup_checkbutton, "active", G_SETTINGS_BIND_DEFAULT);
+ g_settings_bind (capplet->visual_startup_settings, VISUAL_STARTUP_KEY, capplet->visual_startup_checkbutton, "active", G_SETTINGS_BIND_DEFAULT);
gtk_window_set_icon_name(GTK_WINDOW (capplet->window), "preferences-desktop-default-applications");
@@ -824,6 +830,7 @@ main(int argc, char** argv)
capplet->terminal_settings = g_settings_new (TERMINAL_SCHEMA);
capplet->mobility_settings = g_settings_new (MOBILITY_SCHEMA);
capplet->visual_settings = g_settings_new (VISUAL_SCHEMA);
+ capplet->visual_startup_settings = g_settings_new (VISUAL_STARTUP_SCHEMA);
capplet->calculator_settings = g_settings_new (CALCULATOR_SCHEMA);
capplet->messenger_settings = g_settings_new (MESSENGER_SCHEMA);
@@ -835,6 +842,7 @@ main(int argc, char** argv)
g_object_unref (capplet->terminal_settings);
g_object_unref (capplet->mobility_settings);
g_object_unref (capplet->visual_settings);
+ g_object_unref (capplet->visual_startup_settings);
g_object_unref (capplet->calculator_settings);
g_object_unref (capplet->messenger_settings);
diff --git a/capplets/default-applications/mate-da-capplet.h b/capplets/default-applications/mate-da-capplet.h
index 4fa517b0..dca456bb 100644
--- a/capplets/default-applications/mate-da-capplet.h
+++ b/capplets/default-applications/mate-da-capplet.h
@@ -29,7 +29,8 @@
#define VISUAL_SCHEMA "org.mate.applications-at-visual"
#define VISUAL_KEY "exec"
-#define VISUAL_STARTUP_KEY "startup"
+#define VISUAL_STARTUP_SCHEMA "org.gnome.desktop.a11y.applications"
+#define VISUAL_STARTUP_KEY "screen-reader-enabled"
#define MOBILITY_SCHEMA "org.mate.applications-at-mobility"
#define MOBILITY_KEY "exec"
@@ -90,6 +91,7 @@ typedef struct _MateDACapplet {
/* Settings objects */
GSettings* terminal_settings;
GSettings* visual_settings;
+ GSettings* visual_startup_settings;
GSettings* mobility_settings;
GSettings* calculator_settings;
GSettings* messenger_settings;