Adapt to changes in hdy_init()
It must now be called after initializing GTK, and doesn't take parameters.
This commit is contained in:
parent
a2b42f1d3e
commit
726684e9e0
3 changed files with 5 additions and 6 deletions
|
@ -24,6 +24,8 @@
|
|||
#include <glib.h>
|
||||
#include <glib/gi18n.h>
|
||||
#include <gio/gio.h>
|
||||
#define HANDY_USE_UNSTABLE_API
|
||||
#include <handy.h>
|
||||
|
||||
#include "cc-application.h"
|
||||
#include "cc-log.h"
|
||||
|
@ -224,6 +226,8 @@ cc_application_startup (GApplication *application)
|
|||
|
||||
G_APPLICATION_CLASS (cc_application_parent_class)->startup (application);
|
||||
|
||||
hdy_init ();
|
||||
|
||||
gtk_application_set_accels_for_action (GTK_APPLICATION (application),
|
||||
"app.help", help_accels);
|
||||
|
||||
|
|
|
@ -33,9 +33,6 @@
|
|||
#include <cheese-gtk.h>
|
||||
#endif /* HAVE_CHEESE */
|
||||
|
||||
#define HANDY_USE_UNSTABLE_API
|
||||
#include <handy.h>
|
||||
|
||||
#include "cc-application.h"
|
||||
|
||||
static void
|
||||
|
@ -49,8 +46,6 @@ initialize_dependencies (gint *argc,
|
|||
#ifdef HAVE_CHEESE
|
||||
cheese_gtk_init (argc, argv);
|
||||
#endif /* HAVE_CHEESE */
|
||||
|
||||
hdy_init (argc, argv);
|
||||
}
|
||||
|
||||
int
|
||||
|
|
|
@ -651,7 +651,7 @@ main (int argc, char **argv)
|
|||
g_setenv ("LC_ALL", "C", TRUE);
|
||||
|
||||
gtk_test_init (&argc, &argv, NULL);
|
||||
hdy_init (&argc, &argv);
|
||||
hdy_init ();
|
||||
|
||||
g_test_add ("/network-panel-wired/empty-ui",
|
||||
NetworkPanelFixture,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue