Commit c35ff719 authored by Michael Natterer's avatar Michael Natterer 😴

app/libgimp*: remove stuff found by -Wunused-but-set-variable

parent 092e2693
......@@ -167,7 +167,6 @@ drawable_actions_update (GimpActionGroup *group,
GimpImage *image;
GimpDrawable *drawable = NULL;
gboolean is_rgb = FALSE;
gboolean is_gray = FALSE;
gboolean is_indexed = FALSE;
gboolean visible = FALSE;
gboolean linked = FALSE;
......@@ -188,7 +187,6 @@ drawable_actions_update (GimpActionGroup *group,
GimpItem *item;
is_rgb = GIMP_IMAGE_TYPE_IS_RGB (drawable_type);
is_gray = GIMP_IMAGE_TYPE_IS_GRAY (drawable_type);
is_indexed = GIMP_IMAGE_TYPE_IS_INDEXED (drawable_type);
if (GIMP_IS_LAYER_MASK (drawable))
......
......@@ -229,7 +229,6 @@ image_actions_update (GimpActionGroup *group,
gpointer data)
{
GimpImage *image = action_data_get_image (data);
gboolean fs = FALSE;
gboolean aux = FALSE;
gboolean lp = FALSE;
gboolean sel = FALSE;
......@@ -257,7 +256,6 @@ image_actions_update (GimpActionGroup *group,
gimp_action_group_set_action_active (group, action, TRUE);
fs = (gimp_image_get_floating_selection (image) != NULL);
aux = (gimp_image_get_active_channel (image) != NULL);
lp = ! gimp_image_is_empty (image);
sel = ! gimp_channel_is_empty (gimp_image_get_mask (image));
......
......@@ -248,7 +248,6 @@ vectors_actions_update (GimpActionGroup *group,
GimpDrawable *drawable = NULL;
gint n_vectors = 0;
gboolean mask_empty = TRUE;
gboolean global_buf = FALSE;
gboolean visible = FALSE;
gboolean linked = FALSE;
gboolean locked = FALSE;
......@@ -262,7 +261,6 @@ vectors_actions_update (GimpActionGroup *group,
{
n_vectors = gimp_image_get_n_vectors (image);
mask_empty = gimp_channel_is_empty (gimp_image_get_mask (image));
global_buf = FALSE;
vectors = gimp_image_get_active_vectors (image);
......
......@@ -63,7 +63,6 @@ gimp_rc_serialize_properties_diff (GimpConfig *config,
GimpConfig *compare,
GimpConfigWriter *writer)
{
GObjectClass *klass;
GList *diff;
GList *list;
gboolean retval = TRUE;
......@@ -73,8 +72,6 @@ gimp_rc_serialize_properties_diff (GimpConfig *config,
g_return_val_if_fail (G_TYPE_FROM_INSTANCE (config) ==
G_TYPE_FROM_INSTANCE (compare), FALSE);
klass = G_OBJECT_GET_CLASS (config);
diff = gimp_config_diff (G_OBJECT (config),
G_OBJECT (compare), GIMP_CONFIG_PARAM_SERIALIZE);
......
......@@ -688,7 +688,6 @@ gimp_brush_load_abr_brush_v6 (FILE *file,
gint32 brush_size;
gint32 brush_end;
gint32 complement_to_4;
gint32 next_brush;
gint32 top, left, bottom, right;
......@@ -704,9 +703,11 @@ gimp_brush_load_abr_brush_v6 (FILE *file,
brush_size = abr_read_long (file);
brush_end = brush_size;
/* complement to 4 */
while (brush_end % 4 != 0) brush_end++;
complement_to_4 = brush_end - brush_size;
while (brush_end % 4 != 0)
brush_end++;
next_brush = ftell (file) + brush_end;
if (abr_hdr->count == 1)
......
......@@ -199,16 +199,11 @@ gimp_brush_pipe_select_brush (GimpBrush *brush,
{
GimpBrushPipe *pipe = GIMP_BRUSH_PIPE (brush);
gint i, brushix, ix;
gdouble velocity, spacing;
gdouble velocity;
if (pipe->n_brushes == 1)
return GIMP_BRUSH (pipe->current);
/* calculates brush native spacing in pixels, based on it's width)*/
spacing = ((gdouble) gimp_brush_get_spacing (pipe->current) / 100) *
MAX (brush->mask->width, brush->mask->height);
brushix = 0;
for (i = 0; i < pipe->dimension; i++)
{
......
......@@ -221,14 +221,10 @@ gimp_buffer_new (TileManager *tiles,
gboolean copy_pixels)
{
GimpBuffer *buffer;
gint width, height;
g_return_val_if_fail (tiles != NULL, NULL);
g_return_val_if_fail (name != NULL, NULL);
width = tile_manager_width (tiles);
height = tile_manager_height (tiles);
buffer = g_object_new (GIMP_TYPE_BUFFER,
"name", name,
NULL);
......
......@@ -60,7 +60,6 @@ static void
gimp_channel_prop_undo_constructed (GObject *object)
{
GimpChannelPropUndo *channel_prop_undo = GIMP_CHANNEL_PROP_UNDO (object);
GimpImage *image;
GimpChannel *channel;
if (G_OBJECT_CLASS (parent_class)->constructed)
......@@ -68,7 +67,6 @@ gimp_channel_prop_undo_constructed (GObject *object)
g_assert (GIMP_IS_CHANNEL (GIMP_ITEM_UNDO (object)->item));
image = GIMP_UNDO (object)->image;
channel = GIMP_CHANNEL (GIMP_ITEM_UNDO (object)->item);
switch (GIMP_UNDO (object)->undo_type)
......
......@@ -36,13 +36,13 @@ gboolean
gimp_curve_save (GimpData *data,
GError **error)
{
GimpCurve *curve;
/* GimpCurve *curve; */
FILE *file;
g_return_val_if_fail (GIMP_IS_CURVE (data), FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
curve = GIMP_CURVE (data);
/* curve = GIMP_CURVE (data); */
file = g_fopen (gimp_data_get_filename (data), "wb");
......
......@@ -63,7 +63,6 @@ gimp_drawable_bucket_fill (GimpDrawable *drawable,
gdouble y,
GError **error)
{
GimpImage *image;
GimpRGB color;
GimpPattern *pattern = NULL;
......@@ -72,8 +71,6 @@ gimp_drawable_bucket_fill (GimpDrawable *drawable,
g_return_val_if_fail (GIMP_IS_CONTEXT (context), FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
image = gimp_item_get_image (GIMP_ITEM (drawable));
if (fill_mode == GIMP_FG_BUCKET_FILL)
{
gimp_context_get_foreground (context, &color);
......
......@@ -78,7 +78,6 @@ gimp_drawable_transform_tiles_affine (GimpDrawable *drawable,
gint *new_offset_y,
GimpProgress *progress)
{
GimpImage *image;
PixelRegion destPR;
TileManager *new_tiles;
GimpMatrix3 m;
......@@ -95,8 +94,6 @@ gimp_drawable_transform_tiles_affine (GimpDrawable *drawable,
g_return_val_if_fail (new_offset_y != NULL, NULL);
g_return_val_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress), NULL);
image = gimp_item_get_image (GIMP_ITEM (drawable));
m = *matrix;
inv = *matrix;
......
......@@ -1483,14 +1483,12 @@ gimp_drawable_set_tiles_full (GimpDrawable *drawable,
gint offset_y)
{
GimpItem *item;
GimpImage *image;
g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
g_return_if_fail (tiles != NULL);
g_return_if_fail (tile_manager_bpp (tiles) == GIMP_IMAGE_TYPE_BYTES (type));
item = GIMP_ITEM (drawable);
image = gimp_item_get_image (item);
if (! gimp_item_is_attached (GIMP_ITEM (drawable)))
push_undo = FALSE;
......
......@@ -60,7 +60,6 @@ static void
gimp_layer_prop_undo_constructed (GObject *object)
{
GimpLayerPropUndo *layer_prop_undo = GIMP_LAYER_PROP_UNDO (object);
GimpImage *image;
GimpLayer *layer;
if (G_OBJECT_CLASS (parent_class)->constructed)
......@@ -68,7 +67,6 @@ gimp_layer_prop_undo_constructed (GObject *object)
g_assert (GIMP_IS_LAYER (GIMP_ITEM_UNDO (object)->item));
image = GIMP_UNDO (object)->image;
layer = GIMP_LAYER (GIMP_ITEM_UNDO (object)->item);
switch (GIMP_UNDO (object)->undo_type)
......
......@@ -530,13 +530,9 @@ gimp_undo_type_to_name (GimpUndoType type)
gboolean
gimp_undo_is_weak (GimpUndo *undo)
{
GimpUndoType type;
if (! undo)
return FALSE;
type = undo->undo_type;
switch (undo->undo_type)
{
case GIMP_UNDO_GROUP_ITEM_VISIBILITY:
......
......@@ -77,7 +77,6 @@ fade_dialog_new (GimpImage *image,
GtkWidget *main_vbox;
GtkWidget *table;
GtkWidget *menu;
GtkWidget *label;
gchar *title;
gint table_row = 0;
......@@ -153,7 +152,7 @@ fade_dialog_new (GimpImage *image,
/* the paint mode menu */
menu = gimp_prop_paint_mode_menu_new (G_OBJECT (private->context),
"paint-mode", TRUE, TRUE);
label = gimp_table_attach_aligned (GTK_TABLE (table), 0, table_row++,
gimp_table_attach_aligned (GTK_TABLE (table), 0, table_row++,
_("_Mode:"), 0.0, 0.5,
menu, 2, FALSE);
......
......@@ -107,27 +107,11 @@ gimp_display_shell_update_scrollbars_and_rulers (GimpDisplayShell *shell)
void
gimp_display_shell_scale_update_scrollbars (GimpDisplayShell *shell)
{
GimpImage *image;
gint image_width;
gint image_height;
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
if (! shell->display)
return;
image = gimp_display_get_image (shell->display);
if (image)
{
image_width = gimp_image_get_width (image);
image_height = gimp_image_get_height (image);
}
else
{
image_width = shell->disp_width;
image_height = shell->disp_height;
}
/* Horizontal scrollbar */
g_object_freeze_notify (G_OBJECT (shell->hsbdata));
......
......@@ -904,7 +904,6 @@ void
gimp_image_window_shrink_wrap (GimpImageWindow *window,
gboolean grow_only)
{
GimpImageWindowPrivate *private;
GimpDisplayShell *active_shell;
GimpImage *image;
GtkWidget *widget;
......@@ -920,8 +919,6 @@ gimp_image_window_shrink_wrap (GimpImageWindow *window,
g_return_if_fail (GIMP_IS_IMAGE_WINDOW (window));
private = GIMP_IMAGE_WINDOW_GET_PRIVATE (window);
if (! gtk_widget_get_realized (GTK_WIDGET (window)))
return;
......
......@@ -127,9 +127,6 @@ color_pixels_mask (guchar *dest,
guint bytes)
{
guchar c0, c1, c2;
gint alpha;
alpha = HAS_ALPHA (bytes) ? bytes - 1 : bytes;
switch (bytes)
{
......
......@@ -108,7 +108,6 @@ gimp_paint_core_stroke_boundary (GimpPaintCore *core,
gboolean push_undo,
GError **error)
{
GimpImage *image;
BoundSeg *stroke_segs;
gint n_stroke_segs;
gint off_x;
......@@ -126,8 +125,6 @@ gimp_paint_core_stroke_boundary (GimpPaintCore *core,
g_return_val_if_fail (bound_segs != NULL && n_bound_segs > 0, FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
image = gimp_item_get_image (GIMP_ITEM (drawable));
stroke_segs = boundary_sort (bound_segs, n_bound_segs, &n_stroke_segs);
if (n_stroke_segs == 0)
......
......@@ -163,14 +163,11 @@ gimp_smudge_start (GimpPaintCore *paint_core,
const GimpCoords *coords)
{
GimpSmudge *smudge = GIMP_SMUDGE (paint_core);
GimpImage *image;
TempBuf *area;
PixelRegion srcPR;
gint bytes;
gint x, y, w, h;
image = gimp_item_get_image (GIMP_ITEM (drawable));
if (gimp_drawable_is_indexed (drawable))
return FALSE;
......
......@@ -298,12 +298,9 @@ gimp_image_map_tool_initialize (GimpTool *tool,
GtkWidget *dialog;
GtkWidget *vbox;
GtkWidget *toggle;
const gchar *stock_id;
klass = GIMP_IMAGE_MAP_TOOL_GET_CLASS (image_map_tool);
stock_id = gimp_viewable_get_stock_id (GIMP_VIEWABLE (tool_info));
window = gimp_display_shell_get_window (display_shell);
image_map_tool->overlay = gimp_image_window_get_fullscreen (window);
......
......@@ -1812,7 +1812,7 @@ find_max_gradient (GimpIscissorsTool *iscissors,
gint radius;
gint i, j;
gint endx, endy;
gint sx, sy, cx, cy;
gint cx, cy;
gint x1, y1, x2, y2;
gpointer pr;
gfloat max_gradient;
......@@ -1827,8 +1827,6 @@ find_max_gradient (GimpIscissorsTool *iscissors,
/* calculate the extent of the search */
cx = CLAMP (*x, 0, gimp_image_get_width (image));
cy = CLAMP (*y, 0, gimp_image_get_height (image));
sx = cx - radius;
sy = cy - radius;
x1 = CLAMP (cx - radius, 0, gimp_image_get_width (image));
y1 = CLAMP (cy - radius, 0, gimp_image_get_height (image));
x2 = CLAMP (cx + radius, 0, gimp_image_get_width (image));
......
......@@ -556,12 +556,8 @@ gimp_rectangle_select_tool_oper_update (GimpTool *tool,
gboolean proximity,
GimpDisplay *display)
{
GimpRectangleFunction function;
gimp_rectangle_tool_oper_update (tool, coords, state, proximity, display);
function = gimp_rectangle_tool_get_function (GIMP_RECTANGLE_TOOL (tool));
GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, proximity,
display);
}
......
......@@ -900,8 +900,6 @@ gimp_rectangle_tool_button_press (GimpTool *tool,
GimpRectangleTool *rect_tool;
GimpDrawTool *draw_tool;
GimpRectangleToolPrivate *private;
GimpRectangleOptions *options;
GimpRectangleOptionsPrivate *options_private;
gdouble snapped_x, snapped_y;
gint snap_x, snap_y;
......@@ -910,8 +908,6 @@ gimp_rectangle_tool_button_press (GimpTool *tool,
rect_tool = GIMP_RECTANGLE_TOOL (tool);
draw_tool = GIMP_DRAW_TOOL (tool);
private = GIMP_RECTANGLE_TOOL_GET_PRIVATE (tool);
options = GIMP_RECTANGLE_TOOL_GET_OPTIONS (tool);
options_private = GIMP_RECTANGLE_OPTIONS_GET_PRIVATE (options);
gimp_draw_tool_pause (draw_tool);
......@@ -1019,13 +1015,11 @@ gimp_rectangle_tool_button_release (GimpTool *tool,
{
GimpRectangleTool *rect_tool;
GimpRectangleToolPrivate *private;
GimpRectangleOptions *options;
g_return_if_fail (GIMP_IS_RECTANGLE_TOOL (tool));
rect_tool = GIMP_RECTANGLE_TOOL (tool);
private = GIMP_RECTANGLE_TOOL_GET_PRIVATE (tool);
options = GIMP_RECTANGLE_TOOL_GET_OPTIONS (tool);
gimp_draw_tool_pause (GIMP_DRAW_TOOL (tool));
......@@ -1096,7 +1090,6 @@ gimp_rectangle_tool_motion (GimpTool *tool,
GimpRectangleTool *rect_tool;
GimpRectangleToolPrivate *private;
GimpRectangleOptions *options;
GimpRectangleOptionsPrivate *options_private;
gdouble snapped_x;
gdouble snapped_y;
gint snap_x, snap_y;
......@@ -1106,7 +1099,6 @@ gimp_rectangle_tool_motion (GimpTool *tool,
rect_tool = GIMP_RECTANGLE_TOOL (tool);
private = GIMP_RECTANGLE_TOOL_GET_PRIVATE (tool);
options = GIMP_RECTANGLE_TOOL_GET_OPTIONS (tool);
options_private = GIMP_RECTANGLE_OPTIONS_GET_PRIVATE (options);
/* Motion events should be ignored when we're just waiting for the
* button release event to execute or if the user has grabbed a dead
......@@ -1668,14 +1660,12 @@ gimp_rectangle_tool_cursor_update (GimpTool *tool,
GdkModifierType state,
GimpDisplay *display)
{
GimpRectangleTool *rect_tool;
GimpRectangleToolPrivate *private;
GimpCursorType cursor = GIMP_CURSOR_CROSSHAIR_SMALL;
GimpCursorModifier modifier = GIMP_CURSOR_MODIFIER_NONE;
g_return_if_fail (GIMP_IS_RECTANGLE_TOOL (tool));
rect_tool = GIMP_RECTANGLE_TOOL (tool);
private = GIMP_RECTANGLE_TOOL_GET_PRIVATE (tool);
if (tool->display == display)
......@@ -2132,7 +2122,6 @@ gimp_rectangle_tool_start (GimpRectangleTool *rect_tool,
{
GimpTool *tool = GIMP_TOOL (rect_tool);
GimpRectangleOptionsPrivate *options_private;
GimpRectangleToolPrivate *private;
GimpImage *image;
gdouble xres;
gdouble yres;
......@@ -2140,8 +2129,6 @@ gimp_rectangle_tool_start (GimpRectangleTool *rect_tool,
options_private =
GIMP_RECTANGLE_OPTIONS_GET_PRIVATE (gimp_tool_get_options (tool));
private = GIMP_RECTANGLE_TOOL_GET_PRIVATE (rect_tool);
image = gimp_display_get_image (display);
tool->display = display;
......@@ -2277,15 +2264,12 @@ gimp_rectangle_tool_execute (GimpRectangleTool *rect_tool)
if (iface->execute)
{
GimpRectangleToolPrivate *private;
gdouble pub_x1, pub_y1;
gdouble pub_x2, pub_y2;
gimp_rectangle_tool_get_public_rect (rect_tool,
&pub_x1, &pub_y1, &pub_x2, &pub_y2);
private = GIMP_RECTANGLE_TOOL_GET_PRIVATE (rect_tool);
gimp_draw_tool_pause (GIMP_DRAW_TOOL (rect_tool));
retval = iface->execute (rect_tool,
......@@ -2317,7 +2301,6 @@ static void
gimp_rectangle_tool_update_options (GimpRectangleTool *rect_tool,
GimpDisplay *display)
{
GimpRectangleToolPrivate *private;
GimpRectangleOptions *options;
gdouble x1, y1;
gdouble x2, y2;
......@@ -2326,7 +2309,6 @@ gimp_rectangle_tool_update_options (GimpRectangleTool *rect_tool,
gdouble old_width;
gdouble old_height;
private = GIMP_RECTANGLE_TOOL_GET_PRIVATE (rect_tool);
options = GIMP_RECTANGLE_TOOL_GET_OPTIONS (rect_tool);
gimp_rectangle_tool_get_public_rect (rect_tool, &x1, &y1, &x2, &y2);
......@@ -2960,13 +2942,10 @@ gimp_rectangle_tool_update_highlight (GimpRectangleTool *rect_tool)
}
else
{
GimpRectangleToolPrivate *private;
GdkRectangle rect;
gdouble pub_x1, pub_y1;
gdouble pub_x2, pub_y2;
private = GIMP_RECTANGLE_TOOL_GET_PRIVATE (tool);
gimp_rectangle_tool_get_public_rect (rect_tool,
&pub_x1, &pub_y1, &pub_x2, &pub_y2);
......@@ -3100,14 +3079,8 @@ gimp_rectangle_tool_get_other_side_coord (GimpRectangleTool *rect_tool,
gdouble *other_side_x,
gdouble *other_side_y)
{
GimpRectangleToolPrivate *private;
gdouble *other_x;
gdouble *other_y;
private = GIMP_RECTANGLE_TOOL_GET_PRIVATE (rect_tool);
other_x = NULL;
other_y = NULL;
gdouble *other_x = NULL;
gdouble *other_y = NULL;
gimp_rectangle_tool_get_other_side (rect_tool,
&other_x,
......@@ -3123,14 +3096,8 @@ gimp_rectangle_tool_set_other_side_coord (GimpRectangleTool *rect_tool,
gdouble other_side_x,
gdouble other_side_y)
{
GimpRectangleToolPrivate *private;
gdouble *other_x;
gdouble *other_y;
private = GIMP_RECTANGLE_TOOL_GET_PRIVATE (rect_tool);
other_x = NULL;
other_y = NULL;
gdouble *other_x = NULL;
gdouble *other_y = NULL;
gimp_rectangle_tool_get_other_side (rect_tool,
&other_x,
......@@ -3629,12 +3596,8 @@ gimp_rectangle_tool_apply_fixed_width (GimpRectangleTool *rect_tool,
gdouble width)
{
GimpRectangleToolPrivate *private;
GimpRectangleOptions *options;
GimpRectangleOptionsPrivate *options_private;
private = GIMP_RECTANGLE_TOOL_GET_PRIVATE (rect_tool);
options = GIMP_RECTANGLE_TOOL_GET_OPTIONS (rect_tool);
options_private = GIMP_RECTANGLE_OPTIONS_GET_PRIVATE (options);
switch (private->function)
{
......@@ -3689,12 +3652,8 @@ gimp_rectangle_tool_apply_fixed_height (GimpRectangleTool *rect_tool,
{
GimpRectangleToolPrivate *private;
GimpRectangleOptions *options;
GimpRectangleOptionsPrivate *options_private;
private = GIMP_RECTANGLE_TOOL_GET_PRIVATE (rect_tool);
options = GIMP_RECTANGLE_TOOL_GET_OPTIONS (rect_tool);
options_private = GIMP_RECTANGLE_OPTIONS_GET_PRIVATE (options);
switch (private->function)
{
......
......@@ -202,7 +202,6 @@ gimp_bezier_stroke_new_from_coords (const GimpCoords *coords,
gint n_coords,
gboolean closed)
{
GimpBezierStroke *bezier_stroke;
GimpStroke *stroke;
GimpAnchor *last_anchor;
gint count;
......@@ -213,8 +212,6 @@ gimp_bezier_stroke_new_from_coords (const GimpCoords *coords,
stroke = gimp_bezier_stroke_new ();
bezier_stroke = GIMP_BEZIER_STROKE (stroke);
last_anchor = NULL;
for (count = 0; count < n_coords; count++)
......@@ -990,12 +987,9 @@ static gboolean
gimp_bezier_stroke_is_extendable (GimpStroke *stroke,
GimpAnchor *neighbor)
{
GimpBezierStroke *bezier_stroke;
GList *listneighbor;
gint loose_end;
bezier_stroke = GIMP_BEZIER_STROKE (stroke);
if (stroke->closed)
return FALSE;
......@@ -1080,12 +1074,9 @@ gimp_bezier_stroke_extend (GimpStroke *stroke,
GimpVectorExtendMode extend_mode)
{
GimpAnchor *anchor = NULL;
GimpBezierStroke *bezier_stroke;
GList *listneighbor;
gint loose_end, control_count;
bezier_stroke = GIMP_BEZIER_STROKE (stroke);
if (stroke->anchors == NULL)
{
/* assure that there is no neighbor specified */
......
......@@ -58,16 +58,14 @@ gimp_vectors_prop_undo_init (GimpVectorsPropUndo *undo)
static void
gimp_vectors_prop_undo_constructed (GObject *object)
{
GimpImage *image;
GimpVectors *vectors;
/* GimpVectors *vectors; */
if (G_OBJECT_CLASS (parent_class)->constructed)
G_OBJECT_CLASS (parent_class)->constructed (object);
g_assert (GIMP_IS_VECTORS (GIMP_ITEM_UNDO (object)->item));
image = GIMP_UNDO (object)->image;
vectors = GIMP_VECTORS (GIMP_ITEM_UNDO (object)->item);
/* vectors = GIMP_VECTORS (GIMP_ITEM_UNDO (object)->item); */
switch (GIMP_UNDO (object)->undo_type)
{
......
......@@ -1311,8 +1311,6 @@ gimp_dockbook_tab_drag_begin (GtkWidget *widget,
GdkDragContext *context,
GimpDockable *dockable)
{
GimpDock *dock;
GimpPanedBoxClass *paned_box_class;
GtkAllocation allocation;
GtkWidget *window;
GtkWidget *view;
......@@ -1320,9 +1318,6 @@ gimp_dockbook_tab_drag_begin (GtkWidget *widget,
gint drag_x;
gint drag_y;
dock = GIMP_DOCK (gimp_dockable_get_dockbook (dockable)->p->dock);
paned_box_class = GIMP_PANED_BOX_GET_CLASS (gimp_dock_get_vbox (dock));
gtk_widget_get_allocation (widget, &allocation);
window = gtk_window_new (GTK_WINDOW_POPUP);
......@@ -1359,12 +1354,8 @@ gimp_dockbook_tab_drag_end (GtkWidget *widget,
GdkDragContext *context,
GimpDockable *dockable)
{
GimpDock *dock;
GimpPanedBoxClass *paned_box_class;
GtkWidget *drag_widget;
dock = GIMP_DOCK (gimp_dockable_get_dockbook (dockable)->p->dock);
paned_box_class = GIMP_PANED_BOX_GET_CLASS (gimp_dock_get_vbox (dock));
drag_widget = g_object_get_data (G_OBJECT (dockable),
"gimp-dock-drag-widget");
......
......@@ -305,7 +305,6 @@ gimp_dynamics_editor_add_output_row (GObject *config,
gint row)
{
GtkWidget *label;
GtkWidget *button;
gint column = 1;
label = gtk_label_new (row_label);
......@@ -314,31 +313,31 @@ gimp_dynamics_editor_add_output_row (GObject *config,
GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
gtk_widget_show (label);
button = dynamics_check_button_new (config, "use-pressure",
dynamics_check_button_new (config, "use-pressure",
table, column, row);
column++;
button = dynamics_check_button_new (config, "use-velocity",
dynamics_check_button_new (config, "use-velocity",
table, column, row);
column++;
button = dynamics_check_button_new (config, "use-direction",
dynamics_check_button_new (config, "use-direction",
table, column, row);
column++;
button = dynamics_check_button_new (config, "use-tilt",
dynamics_check_button_new (config, "use-tilt",
table, column, row);
column++;
button = dynamics_check_button_new (config, "use-wheel",
dynamics_check_button_new (config, "use-wheel",
table, column, row);
column++;
button = dynamics_check_button_new (config, "use-random",
dynamics_check_button_new (config, "use-random",
table, column, row);
column++;
button = dynamics_check_button_new (config, "use-fade",
dynamics_check_button_new (config, "use-fade",
table, column, row);
column++;
}
......
......@@ -59,7 +59,6 @@ gimp_dynamics_factory_view_new (GimpViewType view_type,
GimpMenuFactory *menu_factory)
{
GimpDynamicsFactoryView *factory_view;
GimpContainerEditor *editor;
g_return_val_if_fail (GIMP_IS_DATA_FACTORY (factory), NULL);
g_return_val_if_fail (view_size > 0 &&
......@@ -83,7 +82,5 @@ gimp_dynamics_factory_view_new (GimpViewType view_type,
return NULL;
}
editor = GIMP_CONTAINER_EDITOR (factory_view);
return GTK_WIDGET (factory_view);
}
......@@ -624,7 +624,6 @@ gimp_item_tree_view_add_options (GimpItemTreeView *view,
{
gint content_spacing;
gint button_spacing;