From 52c27cd6729fa30b0c6c98d8729b93178da20171 Mon Sep 17 00:00:00 2001 From: Rui Matos Date: Sat, 29 Nov 2014 19:22:52 +0100 Subject: [PATCH] shell: Drop deprecated API usage https://bugzilla.gnome.org/show_bug.cgi?id=740986 --- shell/cc-application.c | 5 +++-- shell/cc-window.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/shell/cc-application.c b/shell/cc-application.c index 06d9110f0..5f5858721 100644 --- a/shell/cc-application.c +++ b/shell/cc-application.c @@ -289,6 +289,7 @@ cc_application_startup (GApplication *application) GMenu *menu; GMenu *section; GSimpleAction *action; + const gchar *help_accels[] = { "F1", NULL }; G_APPLICATION_CLASS (cc_application_parent_class)->startup (application); @@ -333,8 +334,8 @@ cc_application_startup (GApplication *application) gtk_application_set_app_menu (GTK_APPLICATION (application), G_MENU_MODEL (menu)); - gtk_application_add_accelerator (GTK_APPLICATION (application), - "F1", "app.help", NULL); + gtk_application_set_accels_for_action (GTK_APPLICATION (application), + "app.help", help_accels); self->priv->window = cc_window_new (GTK_APPLICATION (application)); } diff --git a/shell/cc-window.c b/shell/cc-window.c index 432da3298..55ab0d939 100644 --- a/shell/cc-window.c +++ b/shell/cc-window.c @@ -161,7 +161,7 @@ activate_panel (CcWindow *self, gtk_lock_button_set_permission (GTK_LOCK_BUTTON (priv->lock_button), cc_panel_get_permission (CC_PANEL (priv->current_panel))); - box = gtk_alignment_new (0, 0, 1, 1); + box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (box), priv->current_panel);