From 2ec2502644e18fbc9c3685fd569d4c99c48de93c Mon Sep 17 00:00:00 2001
From: Sven Neumann <sven@gimp.org>
Date: Tue, 27 Jun 2006 10:42:03 +0000
Subject: [PATCH] removed unused includes and stubs.

2006-06-27  Sven Neumann  <sven@gimp.org>

	* app/tools/gimpalignoptions.c: removed unused includes and stubs.
---
 ChangeLog                    |  4 +++
 app/tools/gimpalignoptions.c | 69 ++++--------------------------------
 app/tools/gimpaligntool.c    |  8 ++---
 3 files changed, 14 insertions(+), 67 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5cbb28a964..e16d43c91d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-27  Sven Neumann  <sven@gimp.org>
+
+	* app/tools/gimpalignoptions.c: removed unused includes and stubs.
+
 2006-06-27  Sven Neumann  <sven@gimp.org>
 
 	* app/config/gimprc-blurbs.h (NUM_PROCESSORS_BLURB): simplified.
diff --git a/app/tools/gimpalignoptions.c b/app/tools/gimpalignoptions.c
index e5c3e7f665..74f1dba026 100644
--- a/app/tools/gimpalignoptions.c
+++ b/app/tools/gimpalignoptions.c
@@ -20,36 +20,11 @@
 
 #include <gtk/gtk.h>
 
-#include "libgimpconfig/gimpconfig.h"
-#include "libgimpwidgets/gimpwidgets.h"
-
 #include "tools-types.h"
 
-#include "core/gimptoolinfo.h"
-
-#include "widgets/gimpwidgets-utils.h"
-
 #include "gimpalignoptions.h"
 #include "gimptooloptions-gui.h"
 
-#include "gimp-intl.h"
-
-
-enum
-{
-  PROP_0,
-};
-
-
-static void   gimp_align_options_set_property (GObject      *object,
-                                               guint         property_id,
-                                               const GValue *value,
-                                               GParamSpec   *pspec);
-static void   gimp_align_options_get_property (GObject      *object,
-                                               guint         property_id,
-                                               GValue       *value,
-                                               GParamSpec   *pspec);
-
 
 G_DEFINE_TYPE (GimpAlignOptions, gimp_align_options, GIMP_TYPE_TOOL_OPTIONS)
 
@@ -57,10 +32,6 @@ G_DEFINE_TYPE (GimpAlignOptions, gimp_align_options, GIMP_TYPE_TOOL_OPTIONS)
 static void
 gimp_align_options_class_init (GimpAlignOptionsClass *klass)
 {
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->set_property = gimp_align_options_set_property;
-  object_class->get_property = gimp_align_options_get_property;
 }
 
 static void
@@ -68,47 +39,19 @@ gimp_align_options_init (GimpAlignOptions *options)
 {
 }
 
-static void
-gimp_align_options_set_property (GObject      *object,
-                                 guint         property_id,
-                                 const GValue *value,
-                                 GParamSpec   *pspec)
-{
-  switch (property_id)
-    {
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-static void
-gimp_align_options_get_property (GObject    *object,
-                                 guint       property_id,
-                                 GValue     *value,
-                                 GParamSpec *pspec)
-{
-  switch (property_id)
-    {
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
 GtkWidget *
 gimp_align_options_gui (GimpToolOptions *tool_options)
 {
   GtkWidget *vbox;
-  GtkWidget *controls_container;
+  GtkWidget *container;
 
   vbox = gimp_tool_options_gui (tool_options);
 
-  controls_container = gtk_vbox_new (FALSE, 0);
-  gtk_box_pack_start (GTK_BOX (vbox), controls_container, FALSE, FALSE, 0);
-  gtk_widget_show (controls_container);
-  g_object_set_data (G_OBJECT (tool_options),
-                     "controls-container", controls_container);
+  container = gtk_vbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), container, FALSE, FALSE, 0);
+  gtk_widget_show (container);
+
+  g_object_set_data (G_OBJECT (tool_options), "controls-container", container);
 
   return vbox;
 }
diff --git a/app/tools/gimpaligntool.c b/app/tools/gimpaligntool.c
index a598d4d9df..f65c6d8b0d 100644
--- a/app/tools/gimpaligntool.c
+++ b/app/tools/gimpaligntool.c
@@ -170,7 +170,7 @@ gimp_align_tool_constructor (GType                  type,
   GObject       *object;
   GimpTool      *tool;
   GimpAlignTool *align_tool;
-  GtkContainer  *controls_container;
+  GtkContainer  *container;
   GObject       *options;
 
   object = G_OBJECT_CLASS (parent_class)->constructor (type, n_params, params);
@@ -182,11 +182,11 @@ gimp_align_tool_constructor (GType                  type,
 
   options = G_OBJECT (tool->tool_info->tool_options);
 
-  controls_container = GTK_CONTAINER (g_object_get_data (options,
-                                                         "controls-container"));
+  container = GTK_CONTAINER (g_object_get_data (options,
+                                                "controls-container"));
 
   align_tool->controls = gimp_align_tool_controls (align_tool);
-  gtk_container_add (controls_container, align_tool->controls);
+  gtk_container_add (container, align_tool->controls);
 
   return object;
 }