|
 |
3f45ee |
diff -pruN im-chooser-1.6.4.orig/libimchooseui/imchooseui.c im-chooser-1.6.4/libimchooseui/imchooseui.c
|
|
|
3f45ee |
--- im-chooser-1.6.4.orig/libimchooseui/imchooseui.c 2013-01-18 03:19:42.000000000 +0000
|
|
|
3f45ee |
+++ im-chooser-1.6.4/libimchooseui/imchooseui.c 2019-02-25 10:51:13.828775637 +0000
|
|
|
3f45ee |
@@ -267,6 +267,14 @@ _imchoose_ui_update_list(IMChooseUI *ui,
|
|
|
3f45ee |
n_retry++;
|
|
|
3f45ee |
goto retry;
|
|
|
3f45ee |
}
|
|
|
3f45ee |
+ if (!imsettings_client_is_supported_desktop(client, NULL, &err)) {
|
|
|
3f45ee |
+ if (err) {
|
|
|
3f45ee |
+ g_error_free(err);
|
|
|
3f45ee |
+ err = NULL;
|
|
|
3f45ee |
+ }
|
|
|
3f45ee |
+ g_spawn_command_line_async("gnome-control-center region", &err;;
|
|
|
3f45ee |
+ goto bail;
|
|
|
3f45ee |
+ }
|
|
|
3f45ee |
|
|
|
3f45ee |
active_info = imsettings_client_get_active_im_info(client, NULL, &err;;
|
|
|
3f45ee |
if (err)
|
|
|
3f45ee |
@@ -739,7 +747,8 @@ imchoose_ui_get(IMChooseUI *ui,
|
|
|
3f45ee |
|
|
|
3f45ee |
retval = GTK_WIDGET (g_object_ref(gtk_builder_get_object(builder, "root")));
|
|
|
3f45ee |
g_object_set_data(tree, "imchoose-ui", ui);
|
|
|
3f45ee |
- _imchoose_ui_update_list(ui, GTK_WIDGET (tree), &err;;
|
|
|
3f45ee |
+ if (!_imchoose_ui_update_list(ui, GTK_WIDGET (tree), &err))
|
|
|
3f45ee |
+ retval = NULL;
|
|
|
3f45ee |
if (err)
|
|
|
3f45ee |
goto bail;
|
|
|
3f45ee |
bail:
|
|
|
3f45ee |
diff -pruN im-chooser-1.6.4.orig/src/app/main.c im-chooser-1.6.4/src/app/main.c
|
|
|
3f45ee |
--- im-chooser-1.6.4.orig/src/app/main.c 2013-04-12 07:55:59.000000000 +0000
|
|
|
3f45ee |
+++ im-chooser-1.6.4/src/app/main.c 2019-02-25 10:52:30.564740513 +0000
|
|
|
3f45ee |
@@ -209,6 +209,8 @@ main(int argc,
|
|
|
3f45ee |
}
|
|
|
3f45ee |
goto bail;
|
|
|
3f45ee |
}
|
|
|
3f45ee |
+ if (!widget)
|
|
|
3f45ee |
+ goto bail;
|
|
|
3f45ee |
progress = imchoose_ui_get_progress_dialog(ui, &err;;
|
|
|
3f45ee |
|
|
|
3f45ee |
gtk_window_set_title(GTK_WINDOW (window), _("Input Method Selector"));
|