Convert on_tree_changed to a gboolean returning false.
This fixes commit 0a29cf61955935ca1e7d3a48ccd38164ec9c80af and g_timer_add_full running in an endless loop. http://bugzilla.gnome.org/show_bug.cgi?id=592608
This commit is contained in:
parent
d540af847a
commit
7f88e02a26
@ -57,7 +57,7 @@ struct _ShellAppSystemPrivate {
|
|||||||
};
|
};
|
||||||
|
|
||||||
static void shell_app_system_finalize (GObject *object);
|
static void shell_app_system_finalize (GObject *object);
|
||||||
static void on_tree_changed (gpointer user_data);
|
static gboolean on_tree_changed (gpointer user_data);
|
||||||
static void on_tree_changed_cb (GMenuTree *tree, gpointer user_data);
|
static void on_tree_changed_cb (GMenuTree *tree, gpointer user_data);
|
||||||
static void reread_menus (ShellAppSystem *self);
|
static void reread_menus (ShellAppSystem *self);
|
||||||
static void on_favorite_apps_changed (GConfClient *client, guint id, GConfEntry *entry, gpointer user_data);
|
static void on_favorite_apps_changed (GConfClient *client, guint id, GConfEntry *entry, gpointer user_data);
|
||||||
@ -415,13 +415,14 @@ reread_menus (ShellAppSystem *self)
|
|||||||
cache_by_id (self, self->priv->cached_settings, TRUE);
|
cache_by_id (self, self->priv->cached_settings, TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static gboolean
|
||||||
on_tree_changed (gpointer user_data)
|
on_tree_changed (gpointer user_data)
|
||||||
{
|
{
|
||||||
ShellAppSystem *self = SHELL_APP_SYSTEM (user_data);
|
ShellAppSystem *self = SHELL_APP_SYSTEM (user_data);
|
||||||
g_signal_emit (self, signals[INSTALLED_CHANGED], 0);
|
g_signal_emit (self, signals[INSTALLED_CHANGED], 0);
|
||||||
reread_menus (self);
|
reread_menus (self);
|
||||||
self->priv->app_change_timeout_id = 0;
|
self->priv->app_change_timeout_id = 0;
|
||||||
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
Loading…
x
Reference in New Issue
Block a user