0af108211c
This patch fixes the "apps vanish from alt-TAB bug". If a "package system" rips away and possibly replaces .desktop files at some random time, we have historically used inotify to detect this and reread state (in a racy way, but...). In GNOME 2, this was generally not too problematic because the menu widget was totally separate from the list of windows - and the data they operate on was disjoint as well. In GNOME 3 we unify these, and this creates architectural problems because the windows are tied to the app. What this patch tries to do is, when rereading the application state, if we have a running application, we keep that app around instead of making a new instance. This ensures we preserve any state such as the set of open windows. This requires moving the running state into ShellAppSystem. Adjust callers as necessary, and while we're at it drop the unused "contexts" stuff. This is just a somewhat quick band-aid; a REAL fix would require us having low-level control over application installation. As long as we're on top of random broken tar+wget wrappers, it will be gross. A slight future improvement to this patch would add an explicit "merge" between the old and new data. I think probably we always keep around the ShellApp corresponding to a given ID, but replace its GMenuTreeEntry. https://bugzilla.gnome.org/show_bug.cgi?id=657990
74 lines
3.3 KiB
C
74 lines
3.3 KiB
C
/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
|
|
#ifndef __SHELL_APP_SYSTEM_H__
|
|
#define __SHELL_APP_SYSTEM_H__
|
|
|
|
#include <gio/gio.h>
|
|
#include <clutter/clutter.h>
|
|
#include <meta/window.h>
|
|
#define GMENU_I_KNOW_THIS_IS_UNSTABLE
|
|
#include <gmenu-tree.h>
|
|
|
|
#include "shell-app.h"
|
|
|
|
#define SHELL_TYPE_APP_SYSTEM (shell_app_system_get_type ())
|
|
#define SHELL_APP_SYSTEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SHELL_TYPE_APP_SYSTEM, ShellAppSystem))
|
|
#define SHELL_APP_SYSTEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SHELL_TYPE_APP_SYSTEM, ShellAppSystemClass))
|
|
#define SHELL_IS_APP_SYSTEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SHELL_TYPE_APP_SYSTEM))
|
|
#define SHELL_IS_APP_SYSTEM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SHELL_TYPE_APP_SYSTEM))
|
|
#define SHELL_APP_SYSTEM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SHELL_TYPE_APP_SYSTEM, ShellAppSystemClass))
|
|
|
|
typedef struct _ShellAppSystem ShellAppSystem;
|
|
typedef struct _ShellAppSystemClass ShellAppSystemClass;
|
|
typedef struct _ShellAppSystemPrivate ShellAppSystemPrivate;
|
|
|
|
struct _ShellAppSystem
|
|
{
|
|
GObject parent;
|
|
|
|
ShellAppSystemPrivate *priv;
|
|
};
|
|
|
|
struct _ShellAppSystemClass
|
|
{
|
|
GObjectClass parent_class;
|
|
|
|
void (*installed_changed)(ShellAppSystem *appsys, gpointer user_data);
|
|
void (*favorites_changed)(ShellAppSystem *appsys, gpointer user_data);
|
|
};
|
|
|
|
GType shell_app_system_get_type (void) G_GNUC_CONST;
|
|
ShellAppSystem *shell_app_system_get_default (void);
|
|
|
|
GMenuTree *shell_app_system_get_tree (ShellAppSystem *system);
|
|
|
|
ShellApp *shell_app_system_lookup_app (ShellAppSystem *system,
|
|
const char *id);
|
|
ShellApp *shell_app_system_lookup_app_by_tree_entry (ShellAppSystem *system,
|
|
GMenuTreeEntry *entry);
|
|
ShellApp *shell_app_system_lookup_app_for_path (ShellAppSystem *system,
|
|
const char *desktop_path);
|
|
ShellApp *shell_app_system_lookup_heuristic_basename (ShellAppSystem *system,
|
|
const char *id);
|
|
|
|
|
|
GSList *shell_app_system_get_all (ShellAppSystem *system);
|
|
|
|
GSList *shell_app_system_get_running (ShellAppSystem *self);
|
|
|
|
GSList *shell_app_system_initial_search (ShellAppSystem *system,
|
|
GSList *terms);
|
|
GSList *shell_app_system_subsearch (ShellAppSystem *system,
|
|
GSList *previous_results,
|
|
GSList *terms);
|
|
|
|
GMenuTree *shell_app_system_get_settings_tree (ShellAppSystem *system);
|
|
|
|
GSList *shell_app_system_search_settings (ShellAppSystem *system,
|
|
GSList *terms);
|
|
|
|
ShellApp *shell_app_system_lookup_setting (ShellAppSystem *system,
|
|
const char *id);
|
|
|
|
|
|
#endif /* __SHELL_APP_SYSTEM_H__ */
|