[pinpoint] remove some new deprecation warnings
- From: Lionel Landwerlin <llandwerlin src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pinpoint] remove some new deprecation warnings
- Date: Tue, 15 Sep 2015 13:14:56 +0000 (UTC)
commit 1529636df0eb6c18a8e89dd2ea260b2849c4cb97
Author: Lionel Landwerlin <llandwerlin gmail com>
Date: Sun Sep 13 01:29:22 2015 +0200
remove some new deprecation warnings
configure.ac | 2 +-
pinpoint.c | 7 ++++---
pp-clutter.c | 52 ++++++++++++++++++++++++++--------------------------
3 files changed, 31 insertions(+), 30 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 494a93e..87d51ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ AC_PROG_SED
PKG_PROG_PKG_CONFIG
AC_HEADER_STDC
-PINPOINT_DEPS="clutter-gtk-1.0 >= 1.6 clutter-1.0 >= 1.12 gio-2.0 >= 2.26 cairo-pdf pangocairo
gdk-pixbuf-2.0"
+PINPOINT_DEPS="clutter-gtk-1.0 >= 1.6 clutter-1.0 >= 1.23.7 gio-2.0 >= 2.26 cairo-pdf pangocairo
gdk-pixbuf-2.0"
AS_COMPILER_FLAGS([MAINTAINER_CFLAGS], [-Wall])
AC_SUBST(MAINTAINER_CFLAGS)
diff --git a/pinpoint.c b/pinpoint.c
index d26cfcb..b557b3c 100644
--- a/pinpoint.c
+++ b/pinpoint.c
@@ -200,7 +200,6 @@ main (int argc,
context = g_option_context_new ("- Presentations made easy");
g_option_context_add_main_entries (context, entries, NULL);
g_option_context_add_group (context, clutter_get_option_group_without_init ());
- g_option_context_add_group (context, cogl_get_option_group ());
if (!g_option_context_parse (context, &argc, &argv, &error))
{
g_print ("option parsing failed: %s\n", error->message);
@@ -225,9 +224,11 @@ main (int argc,
}
}
- gtk_clutter_init (&argc, &argv);
+ if (!gtk_clutter_init (&argc, &argv))
+ return EXIT_FAILURE;
#ifdef USE_CLUTTER_GST
- clutter_gst_init (&argc, &argv);
+ if (!clutter_gst_init (&argc, &argv))
+ return EXIT_FAILURE;
#endif
#ifdef USE_DAX
dax_init (&argc, &argv);
diff --git a/pp-clutter.c b/pp-clutter.c
index cf0ac20..6aa87dd 100644
--- a/pp-clutter.c
+++ b/pp-clutter.c
@@ -364,8 +364,8 @@ static gboolean commandline_cancel_cb (ClutterActor *actor,
PinPointPoint *point = pp_slidep->data;
if (clutter_event_type (event) == CLUTTER_KEY_PRESS &&
- (clutter_event_get_key_symbol (event) == CLUTTER_Escape ||
- clutter_event_get_key_symbol (event) == CLUTTER_Tab))
+ (clutter_event_get_key_symbol (event) == CLUTTER_KEY_Escape ||
+ clutter_event_get_key_symbol (event) == CLUTTER_KEY_Tab))
{
clutter_actor_grab_key_focus (renderer->stage);
pp_actor_animate (renderer->commandline,
@@ -1356,24 +1356,24 @@ key_pressed (ClutterActor *actor,
if (event) /* There is no event for the first triggering */
switch (clutter_event_get_key_symbol (event))
{
- case CLUTTER_Left:
- case CLUTTER_Up:
- case CLUTTER_BackSpace:
- case CLUTTER_Prior:
+ case CLUTTER_KEY_Left:
+ case CLUTTER_KEY_Up:
+ case CLUTTER_KEY_BackSpace:
+ case CLUTTER_KEY_Prior:
prev_slide (renderer);
break;
- case CLUTTER_Right:
- case CLUTTER_space:
- case CLUTTER_Next:
- case CLUTTER_Down:
+ case CLUTTER_KEY_Right:
+ case CLUTTER_KEY_space:
+ case CLUTTER_KEY_Next:
+ case CLUTTER_KEY_Down:
next_slide (renderer);
break;
- case CLUTTER_Escape:
- case CLUTTER_Q:
- case CLUTTER_q:
+ case CLUTTER_KEY_Escape:
+ case CLUTTER_KEY_Q:
+ case CLUTTER_KEY_q:
g_application_quit (G_APPLICATION (renderer->application));
break;
- case CLUTTER_F1:
+ case CLUTTER_KEY_F1:
{
gboolean was_fullscreen =
pp_get_fullscreen (renderer,
@@ -1385,15 +1385,15 @@ key_pressed (ClutterActor *actor,
was_fullscreen);
}
break;
- case CLUTTER_F2:
+ case CLUTTER_KEY_F2:
if (renderer->autoadvance)
renderer->autoadvance = FALSE;
else
renderer->autoadvance = TRUE;
break;
- case CLUTTER_F11:
- case CLUTTER_F:
- case CLUTTER_f:
+ case CLUTTER_KEY_F11:
+ case CLUTTER_KEY_F:
+ case CLUTTER_KEY_f:
{
gboolean was_fullscreen =
pp_get_fullscreen (renderer,
@@ -1409,22 +1409,22 @@ key_pressed (ClutterActor *actor,
pp_inhibit (renderer, !was_fullscreen);
}
break;
- case CLUTTER_Return:
+ case CLUTTER_KEY_Return:
action_slide (renderer);
break;
- case CLUTTER_Tab:
+ case CLUTTER_KEY_Tab:
activate_commandline (renderer);
break;
- case CLUTTER_b:
- case CLUTTER_B:
- if (CLUTTER_ACTOR_IS_VISIBLE (renderer->curtain))
+ case CLUTTER_KEY_b:
+ case CLUTTER_KEY_B:
+ if (clutter_actor_is_visible (renderer->curtain))
clutter_actor_hide (renderer->curtain);
else
clutter_actor_show (renderer->curtain);
break;
- case CLUTTER_H:
- case CLUTTER_h:
- case CLUTTER_Home:
+ case CLUTTER_KEY_H:
+ case CLUTTER_KEY_h:
+ case CLUTTER_KEY_Home:
start (NULL, NULL, renderer);
break;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]