[gimp/goat-invasion: 358/418] app: remove superfluous frame and label from GEGL tool

[Michael Natterer <mitch src gnome org>]

commit 4d630f97788f8cc8083840dd22e824680c270e47
Author: Ãyvind KolÃs <pippin gimp org>
Date:   Sat Mar 31 17:58:13 2012 +0100

    app: remove superfluous frame and label from GEGL tool

 app/tools/gimpgegltool.c      |    9 +--------
 app/tools/gimpoperationtool.c |    8 ++++----
 app/tools/gimpoperationtool.h |    2 +-
 3 files changed, 6 insertions(+), 13 deletions(-)
---
diff --git a/app/tools/gimpgegltool.c b/app/tools/gimpgegltool.c
index ab67e81..30d50a8 100644
--- a/app/tools/gimpgegltool.c
+++ b/app/tools/gimpgegltool.c
@@ -226,7 +226,6 @@ gimp_gegl_tool_dialog (GimpImageMapTool *image_map_tool)
   GtkCellRenderer   *cell;
   GtkWidget         *main_vbox;
   GtkWidget         *hbox;
-  GtkWidget         *label;
   GtkWidget         *combo;
   GList             *opclasses;
   GList             *iter;
@@ -241,10 +240,6 @@ gimp_gegl_tool_dialog (GimpImageMapTool *image_map_tool)
   gtk_box_reorder_child (GTK_BOX (main_vbox), hbox, 0);
   gtk_widget_show (hbox);
 
-  label = gtk_label_new_with_mnemonic (_("_Operation:"));
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-  gtk_widget_show (label);
-
   store = gtk_list_store_new (N_COLUMNS,
                               G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
 
@@ -297,8 +292,6 @@ gimp_gegl_tool_dialog (GimpImageMapTool *image_map_tool)
 
   tool->operation_combo = combo;
 
-  gtk_label_set_mnemonic_widget (GTK_LABEL (label), combo);
-
   /*  The options vbox  */
   o_tool->options_table =
     gtk_label_new (_("Select an operation from the list above"));
@@ -306,7 +299,7 @@ gimp_gegl_tool_dialog (GimpImageMapTool *image_map_tool)
                              PANGO_ATTR_STYLE, PANGO_STYLE_ITALIC,
                              -1);
   gtk_misc_set_padding (GTK_MISC (o_tool->options_table), 0, 4);
-  gtk_container_add (GTK_CONTAINER (o_tool->options_frame),
+  gtk_container_add (GTK_CONTAINER (o_tool->options_box),
                      o_tool->options_table);
   gtk_widget_show (o_tool->options_table);
 }
diff --git a/app/tools/gimpoperationtool.c b/app/tools/gimpoperationtool.c
index 65fb156..44569b1 100644
--- a/app/tools/gimpoperationtool.c
+++ b/app/tools/gimpoperationtool.c
@@ -189,10 +189,10 @@ gimp_operation_tool_dialog (GimpImageMapTool *image_map_tool)
   main_vbox = gimp_image_map_tool_dialog_get_vbox (image_map_tool);
 
   /*  The options vbox  */
-  tool->options_frame = gimp_frame_new (_("Operation Settings"));
-  gtk_box_pack_start (GTK_BOX (main_vbox), tool->options_frame,
+  tool->options_box = gtk_vbox_new (FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (main_vbox), tool->options_box,
                       FALSE, FALSE, 0);
-  gtk_widget_show (tool->options_frame);
+  gtk_widget_show (tool->options_box);
 }
 
 static void
@@ -266,7 +266,7 @@ gimp_operation_tool_set_operation (GimpOperationTool *tool,
         gimp_prop_table_new (G_OBJECT (tool->config),
                              G_TYPE_FROM_INSTANCE (tool->config),
                              GIMP_CONTEXT (GIMP_TOOL_GET_OPTIONS (tool)));
-      gtk_container_add (GTK_CONTAINER (tool->options_frame),
+      gtk_container_add (GTK_CONTAINER (tool->options_box),
                          tool->options_table);
       gtk_widget_show (tool->options_table);
     }
diff --git a/app/tools/gimpoperationtool.h b/app/tools/gimpoperationtool.h
index a4a8ad1..dc2e95d 100644
--- a/app/tools/gimpoperationtool.h
+++ b/app/tools/gimpoperationtool.h
@@ -41,7 +41,7 @@ struct _GimpOperationTool
   GimpObject       *config;
 
   /* dialog */
-  GtkWidget        *options_frame;
+  GtkWidget        *options_box;
   GtkWidget        *options_table;
 };