[gnome-control-center] wacom: Remove unused geometry struct member

[Bastien Nocera <hadess src gnome org>]

commit 956590dd8bd693c2d3c74536d4f55088e815d6f3
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Jan 11 20:09:40 2012 +0000

    wacom: Remove unused geometry struct member

 panels/wacom/calibrator/calibrator.h |    3 ---
 panels/wacom/calibrator/gui_gtk.c    |   25 ++-----------------------
 2 files changed, 2 insertions(+), 26 deletions(-)
---
diff --git a/panels/wacom/calibrator/calibrator.h b/panels/wacom/calibrator/calibrator.h
index 3ff9b50..31e355c 100644
--- a/panels/wacom/calibrator/calibrator.h
+++ b/panels/wacom/calibrator/calibrator.h
@@ -93,9 +93,6 @@ struct Calib
      * Set to zero if you don't want this check
      */
     int threshold_misclick;
-
-    /* manually specified geometry string */
-    const char* geometry;
 };
 
 void reset      (struct Calib *c);
diff --git a/panels/wacom/calibrator/gui_gtk.c b/panels/wacom/calibrator/gui_gtk.c
index aec279a..8b0e8e0 100644
--- a/panels/wacom/calibrator/gui_gtk.c
+++ b/panels/wacom/calibrator/gui_gtk.c
@@ -103,9 +103,8 @@ resize_display(CalibArea *calib_area)
     /* check that screensize did not change (if no manually specified geometry) */
     GtkAllocation allocation;
     gtk_widget_get_allocation(calib_area->window, &allocation);
-    if (calib_area->calibrator->geometry == NULL &&
-        (calib_area->display_width != allocation.width ||
-         calib_area->display_height != allocation.height ))
+    if (calib_area->display_width != allocation.width ||
+        calib_area->display_height != allocation.height)
     {
         set_display_size(calib_area, allocation.width, allocation.height);
     }
@@ -350,26 +349,6 @@ calibration_area_new (struct Calib *c)
     g_signal_connect (calib_area->window, "destroy",
 		      G_CALLBACK (gtk_main_quit), NULL);
 
-    /* FIXME */
-#if 0
-    /* parse geometry string */
-    if (c->geometry != NULL)
-    {
-        int gw,gh;
-        int res = sscanf(c->geometry,"%dx%d",&gw,&gh);
-        if (res != 2)
-            c->geometry = NULL;
-        else
-            set_display_size(calib_area, gw, gh );\
-    }
-    if (c->geometry == NULL)
-    {
-        GtkAllocation allocation;
-        gtk_widget_get_allocation(calib_area->drawing_area, &allocation);
-        set_display_size(calib_area, allocation.width, allocation.height);
-    }
-#endif
-
     /* Setup timer for animation */
     calib_area->anim_id = g_timeout_add(TIME_STEP, (GSourceFunc)on_timer_signal, calib_area);