gnome: Remove the ability to set a backend

4 files changed, 6 insertions, 63 deletions

diff --git a/src/gnome/gnome-board.c b/src/gnome/gnome-board.c
index df4a6d7..e17414c 100644
--- a/src/gnome/gnome-board.c
+++ b/src/gnome/gnome-board.c
@@ -29,8 +29,7 @@
 
 enum {
   PROP_0,
-  PROP_GRAPHIC,
-  PROP_BACKEND
+  PROP_GRAPHIC
 };
 
 static GtkWidgetClass *parent_class = NULL;
@@ -410,42 +409,6 @@ game_gnome_board_set_graphic (GameGnomeBoard *board, GameGraphic* graphic)
 }
 
 static void
-game_gnome_board_set_backend (GameGnomeBoard *board, const char *backend)
-{
-  gboolean realized, mapped;
-  GtkWidget *widget;
-  
-  g_return_if_fail (GAME_IS_GNOME_BOARD (board));
-
-  if (board->backend_name == backend) /* will trigger if both are NULL */
-    return;
-  if (board->backend_name && backend && g_str_equal (board->backend_name, backend))
-    return;
-  
-  widget = GTK_WIDGET (board);
-  realized = GTK_WIDGET_REALIZED (widget);
-  mapped = GTK_WIDGET_MAPPED (widget);
-  gtk_widget_unrealize (widget);
-
-  g_free (board->backend_name);
-  board->backend_name = g_strdup (backend);
-  board->backend = default_backend;
-  if (backend == NULL) {
-    /* put here so we don't get segfaults with g_str_equal/strcmp */
-  } else if (g_str_equal (backend, "gtk")) {
-    board->backend = &gtk_backend;
-  } else if (g_str_equal (backend, "image")) {
-    board->backend = &image_backend;
-  }
-  gtk_widget_set_double_buffered (GTK_WIDGET (board), board->backend->double_buffered);
-
-  if (mapped)
-    gtk_widget_map (widget);
-  else if (realized)
-    gtk_widget_realize (widget);
-}
-
-static void
 game_gnome_board_get_property (GObject *object, guint param_id, GValue *value, GParamSpec *pspec)
 {
   GameGnomeBoard *board = GAME_GNOME_BOARD (object);
@@ -454,9 +417,6 @@ game_gnome_board_get_property (GObject *object, guint param_id, GValue *value, G
     case PROP_GRAPHIC:
       g_value_set_object (value, board->graphic);
       break;
-    case PROP_BACKEND:
-      g_value_set_string (value, board->backend_name);
-      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
       break;
@@ -473,9 +433,6 @@ game_gnome_board_set_property (GObject *object, guint param_id,
     case PROP_GRAPHIC:
       game_gnome_board_set_graphic (board, g_value_get_object (value));
       break;
-    case PROP_BACKEND:
-      game_gnome_board_set_backend (board, g_value_get_string (value));
-      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
       break;
@@ -510,9 +467,6 @@ game_gnome_board_class_init (gpointer g_class, gpointer class_data)
   g_object_class_install_property (object_class, PROP_GRAPHIC,
       g_param_spec_object ("graphic", _("graphic"), _("Graphic that is displayed"),
 	  GAME_TYPE_GRAPHIC, G_PARAM_READWRITE));
-  g_object_class_install_property (object_class, PROP_BACKEND,
-      g_param_spec_string ("backend", _("backend"), _("name of the cairo backend to use"),
-	  NULL, G_PARAM_READWRITE));
 
   gtkobject_class->destroy = game_gnome_board_destroy;
   
@@ -557,14 +511,14 @@ game_gnome_board_get_type ()
 
 
 GtkWidget *
-game_gnome_board_new (GameGraphic *graphic, const char *backend)
+game_gnome_board_new (GameGraphic *graphic)
 {
   GameGnomeBoard *gnome_board;
 
   g_return_val_if_fail (graphic == NULL || GAME_IS_GRAPHIC (graphic), NULL);
  
   gnome_board = GAME_GNOME_BOARD (g_object_new (GAME_TYPE_GNOME_BOARD, 
-	"graphic", graphic, "backend", backend, NULL));
+	"graphic", graphic, NULL));
 
   return GTK_WIDGET (gnome_board); 
 }
diff --git a/src/gnome/gnome-board.h b/src/gnome/gnome-board.h
index 477a99c..5648481 100644
--- a/src/gnome/gnome-board.h
+++ b/src/gnome/gnome-board.h
@@ -59,8 +59,7 @@ struct _GameGnomeBoardClass
 
 GType		game_gnome_board_get_type	(void) G_GNUC_CONST;
 
-GtkWidget *	game_gnome_board_new		(GameGraphic *		graphic,
-						 const char *		backend);
+GtkWidget *	game_gnome_board_new		(GameGraphic *		graphic);
 
 
 G_END_DECLS
diff --git a/src/gnome/gnome-state.c b/src/gnome/gnome-state.c
index 184d3e1..5695398 100644
--- a/src/gnome/gnome-state.c
+++ b/src/gnome/gnome-state.c
@@ -255,10 +255,6 @@ game_gnome_state_init (GTypeInstance *instance, gpointer g_class)
   g_value_set_boxed (&value, network_locations);
   game_gnome_state_add_value (state, "/network-locations", &value);
   g_value_unset (&value);
-  g_value_init (&value, G_TYPE_STRING);
-  g_value_set_string (&value, "default");
-  game_gnome_state_add_value (state, "/graphic-backend", &value);
-  g_value_unset (&value);
 }
 
 GType
diff --git a/src/gnome/gnome-window.c b/src/gnome/gnome-window.c
index 6db1656..83f5557 100644
--- a/src/gnome/gnome-window.c
+++ b/src/gnome/gnome-window.c
@@ -1171,10 +1171,7 @@ game_gnome_window_update_contents (GameGnomeWindow *window)
 	g_object_set (children->data, "graphic", player->viewport, NULL);
 	children = g_list_next (children);
       } else {
-	GtkWidget *widget = game_gnome_board_new (player->viewport, NULL);
-	if (window->state)
-	  game_gnome_state_create_knot (window->state, "/graphic-backend",
-	      widget, "backend");
+	GtkWidget *widget = game_gnome_board_new (player->viewport);
 	gtk_widget_show (widget);
 	gtk_container_add (box, widget);
       }
@@ -1187,10 +1184,7 @@ game_gnome_window_update_contents (GameGnomeWindow *window)
 	g_object_set (children->data, "graphic", window->game->viewport, NULL);
 	children = g_list_next (children);
       } else {
-	GtkWidget *widget = game_gnome_board_new (window->game->viewport, NULL);
-	if (window->state)
-	  game_gnome_state_create_knot (window->state, "/graphic-backend",
-	      widget, "backend");
+	GtkWidget *widget = game_gnome_board_new (window->game->viewport);
 	gtk_widget_show (widget);
 	gtk_container_add (box, widget);
       }