[aisleriot] all: Remove clutter leftovers
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [aisleriot] all: Remove clutter leftovers
- Date: Sun, 20 Mar 2016 10:23:19 +0000 (UTC)
commit 7ec9e89a38fe0d0a5f70bdf1555456051b5a0c03
Author: Christian Persch <chpe gnome org>
Date: Sun Mar 20 11:22:53 2016 +0100
all: Remove clutter leftovers
src/ar-application.c | 6 ------
src/ar-style-gtk.c | 9 ++-------
src/window.c | 8 --------
3 files changed, 2 insertions(+), 21 deletions(-)
---
diff --git a/src/ar-application.c b/src/ar-application.c
index 6fc8efb..0f8f4f0 100644
--- a/src/ar-application.c
+++ b/src/ar-application.c
@@ -28,12 +28,6 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#ifdef HAVE_CLUTTER
-#include <cogl/cogl.h>
-#include <clutter/clutter.h>
-#include <clutter-gtk/clutter-gtk.h>
-#endif
-
#include "ar-debug.h"
#include "ar-stock.h"
#include "ar-sound.h"
diff --git a/src/ar-style-gtk.c b/src/ar-style-gtk.c
index 36b2b05..4b186fb 100644
--- a/src/ar-style-gtk.c
+++ b/src/ar-style-gtk.c
@@ -44,15 +44,10 @@
static GtkStyleProvider *
ar_style_provider_new (void)
{
-#ifdef HAVE_CLUTTER
-#define NAME "ArClutterEmbed"
-#else
-#define NAME "AisleriotBoard"
-#endif
static const char css[] =
- "" NAME "{\n"
+ " AisleriotBoard {\n"
"background-color: " DEFAULT_BACKGROUND_COLOR_STRING ";\n"
- "-" NAME "-selection-color: " DEFAULT_SELECTION_COLOR_STRING ";\n"
+ "-AisleriotBoard-selection-color: " DEFAULT_SELECTION_COLOR_STRING ";\n"
"background-image: url('resource:///org/gnome/aisleriot/art/baize.png');\n"
"background-repeat: repeat;\n"
"}\n";
diff --git a/src/window.c b/src/window.c
index ee26fd9..6dec2f2 100644
--- a/src/window.c
+++ b/src/window.c
@@ -432,11 +432,7 @@ undo_cb (GtkAction *action,
AisleriotWindowPrivate *priv = window->priv;
/* If a move is in progress, cancel it before changing the game! */
-#ifdef HAVE_CLUTTER
- aisleriot_board_abort_move (AISLERIOT_BOARD (priv->board_actor));
-#else
aisleriot_board_abort_move (priv->board);
-#endif
aisleriot_game_undo_move (priv->game);
}
@@ -447,11 +443,7 @@ redo_cb (GtkAction *action,
{
AisleriotWindowPrivate *priv = window->priv;
-#ifdef HAVE_CLUTTER
- aisleriot_board_abort_move (AISLERIOT_BOARD (priv->board_actor));
-#else
aisleriot_board_abort_move (priv->board);
-#endif
aisleriot_game_redo_move (priv->game);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]