dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app/actions/dialogs-commands.c app/display/gimpdisplayshell-dnd.c 

2004-07-04  Simon Budig  <simon@gimp.org>

	* app/actions/dialogs-commands.c
	* app/display/gimpdisplayshell-dnd.c
	* app/gui/preferences-dialog.c
	* app/tools/gimppainttool.c
	* app/widgets/gimpdeviceinfo.c
	* app/widgets/gimpitemtreeview.c
	* plug-ins/imagemap/imap_selection.c
	* tools/pdbgen/pdb/gradients.pdb: Small changes to make GIMP
	CVS compile with gcc 2.95 again. Mostly double semicolons and
	variable declarations after other stuff. Spotted by Martin
	Renold.

	* app/pdb/gradients_cmds.c: regenerated.

	(there is one issue left, see his patch at
	http://old.homeip.net/martin/gcc-2.95.diff, I did not
	copy the #define va_copy __va_copy, since I don't know
	what happens here.)
This commit is contained in:
Simon Budig 2004-07-04 21:27:09 +00:00 committed by Simon Budig
parent 0fd3c264d7
commit e7af53b0d3
12 changed files with 50 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ChangeLog
View File

@ -1,3 +1,24 @@
2004-07-04 Simon Budig <simon@gimp.org>
* app/actions/dialogs-commands.c
* app/display/gimpdisplayshell-dnd.c
* app/gui/preferences-dialog.c
* app/tools/gimppainttool.c
* app/widgets/gimpdeviceinfo.c
* app/widgets/gimpitemtreeview.c
* plug-ins/imagemap/imap_selection.c
* tools/pdbgen/pdb/gradients.pdb: Small changes to make GIMP
CVS compile with gcc 2.95 again. Mostly double semicolons and
variable declarations after other stuff. Spotted by Martin
Renold.
* app/pdb/gradients_cmds.c: regenerated.
(there is one issue left, see his patch at
http://old.homeip.net/martin/gcc-2.95.diff, I did not
copy the #define va_copy __va_copy, since I don't know
what happens here.)
2004-07-04 Bill Skaggs <weskaggs@primate.ucdavis.edu>
* plug-ins/gfig/gfig-dialog.[ch]:

12
app/actions/dialogs-commands.c
View File

@ -89,8 +89,6 @@ dialogs_create_lc_cmd_callback (GtkAction *action,
gpointer data)
{
GtkWidget *widget;
return_if_no_widget (widget, data);
static const gchar *tabs[] =
{
"gimp-layer-list",
@ -99,6 +97,8 @@ dialogs_create_lc_cmd_callback (GtkAction *action,
"gimp-undo-history"
};
return_if_no_widget (widget, data);
dialogs_create_dock (gtk_widget_get_screen (widget), TRUE,
tabs, G_N_ELEMENTS (tabs));
}
@ -108,8 +108,6 @@ dialogs_create_data_cmd_callback (GtkAction *action,
gpointer data)
{
GtkWidget *widget;
return_if_no_widget (widget, data);
static const gchar *tabs[] =
{
"gimp-brush-grid",
@ -119,6 +117,8 @@ dialogs_create_data_cmd_callback (GtkAction *action,
"gimp-font-list"
};
return_if_no_widget (widget, data);
dialogs_create_dock (gtk_widget_get_screen (widget), FALSE,
tabs, G_N_ELEMENTS (tabs));
}
@ -128,8 +128,6 @@ dialogs_create_stuff_cmd_callback (GtkAction *action,
gpointer data)
{
GtkWidget *widget;
return_if_no_widget (widget, data);
static const gchar *tabs[] =
{
"gimp-buffer-list",
@ -138,6 +136,8 @@ dialogs_create_stuff_cmd_callback (GtkAction *action,
"gimp-template-list"
};
return_if_no_widget (widget, data);
dialogs_create_dock (gtk_widget_get_screen (widget), FALSE,
tabs, G_N_ELEMENTS (tabs));
}

8
app/dialogs/preferences-dialog.c
View File

@ -1835,6 +1835,10 @@ prefs_dialog_new (Gimp *gimp,
&child_iter,
page_index++);
{
GimpContainer *controllers;
GtkWidget *notebook;
GList *list;
enum
{
COLUMN_EVENT,
@ -1842,10 +1846,6 @@ prefs_dialog_new (Gimp *gimp,
NUM_COLUMNS
};
{
GimpContainer *controllers;
GtkWidget *notebook;
GList *list;
controllers = gimp_controllers_get_list (gimp);

2
app/display/gimpdisplayshell-dnd.c
View File

@ -285,7 +285,7 @@ gimp_display_shell_drop_uri_list (GtkWidget *widget,
gpointer data)
{
GimpDisplayShell *shell = GIMP_DISPLAY_SHELL (data);
GimpImage *gimage = shell->gdisp->gimage;;
GimpImage *gimage = shell->gdisp->gimage;
GimpContext *context;
GList *list;

8
app/gui/preferences-dialog.c
View File

@ -1835,6 +1835,10 @@ prefs_dialog_new (Gimp *gimp,
&child_iter,
page_index++);
{
GimpContainer *controllers;
GtkWidget *notebook;
GList *list;
enum
{
COLUMN_EVENT,
@ -1842,10 +1846,6 @@ prefs_dialog_new (Gimp *gimp,
NUM_COLUMNS
};
{
GimpContainer *controllers;
GtkWidget *notebook;
GList *list;
controllers = gimp_controllers_get_list (gimp);

2
app/pdb/gradients_cmds.c
View File

@ -599,7 +599,7 @@ gradients_new_invoker (Gimp *gimp,
gboolean success = TRUE;
Argument *return_args;
gchar *name;
GimpGradient * gradient = NULL;;
GimpGradient * gradient = NULL;
name = (gchar *) args[0].value.pdb_pointer;
if (name == NULL || !g_utf8_validate (name, -1, NULL))

2
app/tools/gimpbrushtool.c
View File

@ -156,7 +156,7 @@ gimp_paint_tool_class_init (GimpPaintToolClass *klass)
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GimpToolClass *tool_class = GIMP_TOOL_CLASS (klass);
GimpDrawToolClass *draw_tool_class = GIMP_DRAW_TOOL_CLASS (klass);
GimpColorToolClass *color_tool_class = GIMP_COLOR_TOOL_CLASS (klass);;
GimpColorToolClass *color_tool_class = GIMP_COLOR_TOOL_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);

2
app/tools/gimppainttool.c
View File

@ -156,7 +156,7 @@ gimp_paint_tool_class_init (GimpPaintToolClass *klass)
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GimpToolClass *tool_class = GIMP_TOOL_CLASS (klass);
GimpDrawToolClass *draw_tool_class = GIMP_DRAW_TOOL_CLASS (klass);
GimpColorToolClass *color_tool_class = GIMP_COLOR_TOOL_CLASS (klass);;
GimpColorToolClass *color_tool_class = GIMP_COLOR_TOOL_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);

2
app/widgets/gimpdeviceinfo.c
View File

@ -107,7 +107,7 @@ gimp_device_info_get_type (void)
static void
gimp_device_info_class_init (GimpDeviceInfoClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);;
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GParamSpec *array_spec;
parent_class = g_type_class_peek_parent (klass);

2
app/widgets/gimpitemtreeview.c
View File

@ -1232,7 +1232,7 @@ static void
gimp_item_tree_view_size_changed (GimpImage *gimage,
GimpItemTreeView *tree_view)
{
GimpContainerView *view = GIMP_CONTAINER_VIEW (tree_view);;
GimpContainerView *view = GIMP_CONTAINER_VIEW (tree_view);
gint preview_size;
gint border_width;

4
plug-ins/imagemap/imap_selection.c
View File

@ -112,10 +112,10 @@ button_press_cb(GtkWidget *widget, GdkEventButton *event, Selection_t *data)
{
if (event->button == 1) {
if (data->doubleclick) {
data->doubleclick = FALSE;
GtkTreePath *path;
data->doubleclick = FALSE;
if (gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (widget),
(gint) event->x, (gint) event->y,
&path, NULL, NULL, NULL)) {

2
tools/pdbgen/pdb/gradients.pdb
View File

@ -360,7 +360,7 @@ sub gradients_new
);
%invoke = (
vars => [ 'GimpGradient * gradient = NULL;'],
vars => [ 'GimpGradient * gradient = NULL'],
code => <<'CODE'
{
gradient = (GimpGradient *)