brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

shell-app: Update app menu if necessary

Browse Source 
Currently we assume that GTK_UNIQUE_BUS_NAME is shared between all
windows of an application. This assumption does not hold true for
applications that specify G_APPLICATION_NON_UNIQUE, so make sure
to update the menu as necessary.

https://bugzilla.gnome.org/show_bug.cgi?id=676238
This commit is contained in:
Florian Müllner 2012-05-17 18:18:53 +02:00
parent f58e8f2a35
commit c303c6b5c1
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/shell-app.c
View File

@ -42,6 +42,7 @@ typedef struct {
/* See GApplication documentation */ /* See GApplication documentation */
GDBusMenuModel *remote_menu; GDBusMenuModel *remote_menu;
GActionMuxer *muxer; GActionMuxer *muxer;
char * unique_bus_name;
} ShellAppRunningState; } ShellAppRunningState;
/** /**
@ -95,7 +96,6 @@ enum {
static guint shell_app_signals[LAST_SIGNAL] = { 0 }; static guint shell_app_signals[LAST_SIGNAL] = { 0 };
static void create_running_state (ShellApp *app); static void create_running_state (ShellApp *app);
static void setup_running_state (ShellApp *app, MetaWindow *window);
static void unref_running_state (ShellAppRunningState *state); static void unref_running_state (ShellAppRunningState *state);
G_DEFINE_TYPE (ShellApp, shell_app, G_TYPE_OBJECT) G_DEFINE_TYPE (ShellApp, shell_app, G_TYPE_OBJECT)
@ -975,7 +975,7 @@ _shell_app_add_window (ShellApp *app,
g_signal_connect (window, "unmanaged", G_CALLBACK(shell_app_on_unmanaged), app); g_signal_connect (window, "unmanaged", G_CALLBACK(shell_app_on_unmanaged), app);
g_signal_connect (window, "notify::user-time", G_CALLBACK(shell_app_on_user_time_changed), app); g_signal_connect (window, "notify::user-time", G_CALLBACK(shell_app_on_user_time_changed), app);
setup_running_state (app, window); shell_app_update_app_menu (app, window);
if (app->state != SHELL_APP_STATE_STARTING) if (app->state != SHELL_APP_STATE_STARTING)
shell_app_state_transition (app, SHELL_APP_STATE_RUNNING); shell_app_state_transition (app, SHELL_APP_STATE_RUNNING);
@ -1221,12 +1221,14 @@ create_running_state (ShellApp *app)
app->running_state->muxer = g_action_muxer_new (); app->running_state->muxer = g_action_muxer_new ();
} }
static void void
setup_running_state (ShellApp *app, shell_app_update_app_menu (ShellApp *app,
MetaWindow *window) MetaWindow *window)
{ {
/* We assume that 'gtk-unique-bus-name', gtk-application-object-path' const gchar *unique_bus_name;
* and 'gtk-app-menu-object-path' are the same for all windows which
/* We assume that 'gtk-application-object-path' and
* 'gtk-app-menu-object-path' are the same for all windows which
* have it set. * have it set.
* *
* It could be possible, however, that the first window we see * It could be possible, however, that the first window we see
@ -1235,23 +1237,27 @@ setup_running_state (ShellApp *app,
* all the rest (until the app is stopped and restarted). * all the rest (until the app is stopped and restarted).
*/ */
if (app->running_state->remote_menu == NULL) unique_bus_name = meta_window_get_gtk_unique_bus_name (window);
if (app->running_state->remote_menu == NULL ||
g_strcmp0 (app->running_state->unique_bus_name, unique_bus_name) != 0)
{ {
const gchar *application_object_path; const gchar *application_object_path;
const gchar *app_menu_object_path; const gchar *app_menu_object_path;
const gchar *unique_bus_name;
GDBusConnection *session; GDBusConnection *session;
GDBusActionGroup *actions; GDBusActionGroup *actions;
application_object_path = meta_window_get_gtk_application_object_path (window); application_object_path = meta_window_get_gtk_application_object_path (window);
app_menu_object_path = meta_window_get_gtk_app_menu_object_path (window); app_menu_object_path = meta_window_get_gtk_app_menu_object_path (window);
unique_bus_name = meta_window_get_gtk_unique_bus_name (window);
if (application_object_path == NULL || app_menu_object_path == NULL || unique_bus_name == NULL) if (application_object_path == NULL || app_menu_object_path == NULL || unique_bus_name == NULL)
return; return;
session = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL); session = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
g_assert (session != NULL); g_assert (session != NULL);
g_clear_pointer (&app->running_state->unique_bus_name, g_free);
app->running_state->unique_bus_name = g_strdup (unique_bus_name);
g_clear_object (&app->running_state->remote_menu);
app->running_state->remote_menu = g_dbus_menu_model_get (session, unique_bus_name, app_menu_object_path); app->running_state->remote_menu = g_dbus_menu_model_get (session, unique_bus_name, app_menu_object_path);
actions = g_dbus_action_group_get (session, unique_bus_name, application_object_path); actions = g_dbus_action_group_get (session, unique_bus_name, application_object_path);
g_action_muxer_insert (app->running_state->muxer, "app", G_ACTION_GROUP (actions)); g_action_muxer_insert (app->running_state->muxer, "app", G_ACTION_GROUP (actions));

1
src/shell-app.h
View File

@ -82,6 +82,7 @@ int shell_app_compare_by_name (ShellApp *app, ShellApp *other);
int shell_app_compare (ShellApp *app, ShellApp *other); int shell_app_compare (ShellApp *app, ShellApp *other);
void shell_app_update_window_actions (ShellApp *app, MetaWindow *window); void shell_app_update_window_actions (ShellApp *app, MetaWindow *window);
void shell_app_update_app_menu (ShellApp *app, MetaWindow *window);
G_END_DECLS G_END_DECLS

5
src/shell-window-tracker.c
View File

@ -357,7 +357,10 @@ update_focus_app (ShellWindowTracker *self)
new_focus_app = new_focus_win ? shell_window_tracker_get_window_app (self, new_focus_win) : NULL; new_focus_app = new_focus_win ? shell_window_tracker_get_window_app (self, new_focus_win) : NULL;
if (new_focus_app) if (new_focus_app)
shell_app_update_window_actions (new_focus_app, new_focus_win); {
shell_app_update_window_actions (new_focus_app, new_focus_win);
shell_app_update_app_menu (new_focus_app, new_focus_win);
}
set_focus_app (self, new_focus_app); set_focus_app (self, new_focus_app);
} }