applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

region: Revert "Don't use IBus if running in fallback mode"

Browse source 
As the fallback mode is going away. #fallback

This reverts commit 658083fffa.

https://bugzilla.gnome.org/show_bug.cgi?id=682871

Conflicts:
	panels/region/gnome-region-panel-input.c
This commit is contained in:
Bastien Nocera 2012-11-09 16:01:44 +01:00
parent 74c407d8e1
commit e0260ac5de
1 changed files with 11 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
panels/region/gnome-region-panel-input.c
View file

@ -63,7 +63,6 @@ static GtkWidget *input_chooser = NULL; /* weak pointer */
static IBusBus *ibus = NULL;
static GHashTable *ibus_engines = NULL;
static GCancellable *ibus_cancellable = NULL;
static guint shell_name_watch_id = 0;
static const gchar *supported_ibus_engines[] = {
/* Simplified Chinese */
@ -303,11 +302,6 @@ strv_contains (const gchar * const *strv,
static void
clear_ibus (void)
{
if (shell_name_watch_id > 0)
{
g_bus_unwatch_name (shell_name_watch_id);
shell_name_watch_id = 0;
}
g_cancellable_cancel (ibus_cancellable);
g_clear_object (&ibus_cancellable);
g_clear_pointer (&ibus_engines, g_hash_table_destroy);
@ -480,26 +474,6 @@ maybe_start_ibus (void)
NULL,
NULL));
}
static void
on_shell_appeared (GDBusConnection *connection,
const gchar *name,
const gchar *name_owner,
gpointer data)
{
GtkBuilder *builder = data;
if (!ibus)
{
ibus = ibus_bus_new_async ();
if (ibus_bus_is_connected (ibus))
fetch_ibus_engines (builder);
else
g_signal_connect_swapped (ibus, "connected",
G_CALLBACK (fetch_ibus_engines), builder);
}
maybe_start_ibus ();
}
#endif /* HAVE_IBUS */
static gboolean
@ -1223,14 +1197,17 @@ setup_input_tabs (GtkBuilder *builder,
#ifdef HAVE_IBUS
ibus_init ();
shell_name_watch_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
"org.gnome.Shell",
G_BUS_NAME_WATCHER_FLAGS_NONE,
on_shell_appeared,
NULL,
builder,
NULL);
g_object_weak_ref (G_OBJECT (builder), (GWeakNotify) clear_ibus, NULL);
if (!ibus)
{
ibus = ibus_bus_new_async ();
if (ibus_bus_is_connected (ibus))
fetch_ibus_engines (builder);
else
g_signal_connect_swapped (ibus, "connected",
G_CALLBACK (fetch_ibus_engines), builder);
g_object_weak_ref (G_OBJECT (builder), (GWeakNotify) clear_ibus, NULL);
}
maybe_start_ibus ();
#endif
populate_with_active_sources (store);