Commit 022d73e2 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

ported fixes from stable branch (mostly missing includes of config.h),

2001-11-05  Sven Neumann  <sven@gimp.org>

        * plug-ins/imagemap/*.c: ported fixes from stable branch (mostly
        missing includes of config.h),

        * plug-ins/gimpressionist/orientmap.c: removed commented out code
        that continued to show up when grepping for deprecated GTK+ code.

        * tools/pdbgen/pdb/procedural_db.pdb: removed unneeded inclusion
        of config.h (it gets added automatically).
parent 7c2b5595
2001-11-05 Sven Neumann <sven@gimp.org>
* plug-ins/imagemap/*.c: ported fixes from stable branch (mostly
missing includes of config.h),
* plug-ins/gimpressionist/orientmap.c: removed commented out code
that continued to show up when grepping for deprecated GTK+ code.
* tools/pdbgen/pdb/procedural_db.pdb: removed unneeded inclusion
of config.h (it gets added automatically).
2001-11-02 Michael Natterer <mitch@gimp.org> 2001-11-02 Michael Natterer <mitch@gimp.org>
* app/display/gimpdisplayshell-scroll.c: stop synthesizing expose * app/display/gimpdisplayshell-scroll.c: stop synthesizing expose
......
...@@ -693,25 +693,3 @@ void create_orientmap_dialog(void) ...@@ -693,25 +693,3 @@ void create_orientmap_dialog(void)
updatevectorprev(); updatevectorprev();
updateompreviewprev(); updateompreviewprev();
} }
/*
void main(int argc, char **argv)
{
gtk_set_locale ();
gtk_init (&argc, &argv);
gtk_rc_parse ("./rc");
if(argc > 1)
readdata(argv[1]);
else {
numvect++;
vector[0].x = 0.5;
vector[0].y = 0.5;
vector[0].dir = 0.0;
vector[0].str = 1.0;
}
create_orientmap_dialog();
gtk_main();
}
*/
...@@ -21,8 +21,11 @@ ...@@ -21,8 +21,11 @@
* *
*/ */
#include "config.h"
#include "imap_about.h" #include "imap_about.h"
#include "imap_default_dialog.h" #include "imap_default_dialog.h"
#include "libgimp/stdplugins-intl.h" #include "libgimp/stdplugins-intl.h"
void void
......
...@@ -21,11 +21,14 @@ ...@@ -21,11 +21,14 @@
* *
*/ */
#include "config.h"
#include "imap_cmd_clear.h" #include "imap_cmd_clear.h"
#include "imap_cmd_delete.h" #include "imap_cmd_delete.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h" #include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static CmdExecuteValue_t clear_command_execute(Command_t *parent); static CmdExecuteValue_t clear_command_execute(Command_t *parent);
static void clear_command_undo(Command_t *parent); static void clear_command_undo(Command_t *parent);
static void clear_command_redo(Command_t *parent); static void clear_command_redo(Command_t *parent);
......
...@@ -21,7 +21,10 @@ ...@@ -21,7 +21,10 @@
* *
*/ */
#include "config.h"
#include "imap_cmd_copy.h" #include "imap_cmd_copy.h"
#include "libgimp/stdplugins-intl.h" #include "libgimp/stdplugins-intl.h"
static CmdExecuteValue_t copy_command_execute(Command_t *parent); static CmdExecuteValue_t copy_command_execute(Command_t *parent);
......
...@@ -21,7 +21,10 @@ ...@@ -21,7 +21,10 @@
* *
*/ */
#include "config.h"
#include "imap_cmd_copy_object.h" #include "imap_cmd_copy_object.h"
#include "libgimp/stdplugins-intl.h" #include "libgimp/stdplugins-intl.h"
static void copy_object_command_destruct(Command_t *parent); static void copy_object_command_destruct(Command_t *parent);
......
...@@ -21,8 +21,11 @@ ...@@ -21,8 +21,11 @@
* *
*/ */
#include "config.h"
#include "imap_cmd_create.h" #include "imap_cmd_create.h"
#include "libgimp/stdplugins-intl.h" #include "libgimp/stdplugins-intl.h"
#include "imap_main.h" #include "imap_main.h"
static CmdExecuteValue_t create_command_execute(Command_t *parent); static CmdExecuteValue_t create_command_execute(Command_t *parent);
......
...@@ -21,11 +21,14 @@ ...@@ -21,11 +21,14 @@
* *
*/ */
#include "config.h"
#include "imap_cmd_delete.h" #include "imap_cmd_delete.h"
#include "imap_cmd_cut.h" #include "imap_cmd_cut.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h" #include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static void cut_command_destruct(Command_t *parent); static void cut_command_destruct(Command_t *parent);
static CmdExecuteValue_t cut_command_execute(Command_t *parent); static CmdExecuteValue_t cut_command_execute(Command_t *parent);
static void cut_command_undo(Command_t *parent); static void cut_command_undo(Command_t *parent);
......
...@@ -21,12 +21,15 @@ ...@@ -21,12 +21,15 @@
* *
*/ */
#include "config.h"
#include "imap_cmd_copy_object.h" #include "imap_cmd_copy_object.h"
#include "imap_cmd_cut_object.h" #include "imap_cmd_cut_object.h"
#include "imap_cmd_delete.h" #include "imap_cmd_delete.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h" #include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static CmdExecuteValue_t cut_object_command_execute(Command_t *parent); static CmdExecuteValue_t cut_object_command_execute(Command_t *parent);
static void cut_object_command_undo(Command_t *parent); static void cut_object_command_undo(Command_t *parent);
static void cut_object_command_redo(Command_t *parent); static void cut_object_command_redo(Command_t *parent);
......
...@@ -21,10 +21,13 @@ ...@@ -21,10 +21,13 @@
* *
*/ */
#include "config.h"
#include "imap_cmd_delete.h" #include "imap_cmd_delete.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h" #include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static void delete_command_destruct(Command_t *parent); static void delete_command_destruct(Command_t *parent);
static CmdExecuteValue_t delete_command_execute(Command_t *parent); static CmdExecuteValue_t delete_command_execute(Command_t *parent);
static void delete_command_undo(Command_t *parent); static void delete_command_undo(Command_t *parent);
......
...@@ -21,11 +21,14 @@ ...@@ -21,11 +21,14 @@
* *
*/ */
#include "config.h"
#include "imap_cmd_delete_point.h" #include "imap_cmd_delete_point.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h" #include "imap_main.h"
#include "imap_polygon.h" #include "imap_polygon.h"
#include "libgimp/stdplugins-intl.h"
static CmdExecuteValue_t delete_point_command_execute(Command_t *parent); static CmdExecuteValue_t delete_point_command_execute(Command_t *parent);
static void delete_point_command_undo(Command_t *parent); static void delete_point_command_undo(Command_t *parent);
......
...@@ -21,10 +21,13 @@ ...@@ -21,10 +21,13 @@
* *
*/ */
#include "config.h"
#include "imap_cmd_edit_object.h" #include "imap_cmd_edit_object.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h" #include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static void edit_object_command_destruct(Command_t *parent); static void edit_object_command_destruct(Command_t *parent);
static void edit_object_command_undo(Command_t *parent); static void edit_object_command_undo(Command_t *parent);
......
...@@ -21,17 +21,19 @@ ...@@ -21,17 +21,19 @@
* *
*/ */
#include "config.h"
#include <stdio.h> #include <stdio.h>
#include "config.h"
#include "imap_cmd_create.h" #include "imap_cmd_create.h"
#include "imap_default_dialog.h" #include "imap_default_dialog.h"
#include "imap_cmd_guides.h" #include "imap_cmd_guides.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h" #include "imap_main.h"
#include "imap_rectangle.h" #include "imap_rectangle.h"
#include "imap_table.h" #include "imap_table.h"
#include "libgimp/stdplugins-intl.h"
typedef struct { typedef struct {
DefaultDialog_t *dialog; DefaultDialog_t *dialog;
GtkWidget *image_dimensions; GtkWidget *image_dimensions;
......
...@@ -21,11 +21,14 @@ ...@@ -21,11 +21,14 @@
* *
*/ */
#include "config.h"
#include "imap_cmd_insert_point.h" #include "imap_cmd_insert_point.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h" #include "imap_main.h"
#include "imap_polygon.h" #include "imap_polygon.h"
#include "libgimp/stdplugins-intl.h"
static CmdExecuteValue_t insert_point_command_execute(Command_t *parent); static CmdExecuteValue_t insert_point_command_execute(Command_t *parent);
static void insert_point_command_undo(Command_t *parent); static void insert_point_command_undo(Command_t *parent);
......
...@@ -21,11 +21,14 @@ ...@@ -21,11 +21,14 @@
* *
*/ */
#include "config.h"
#include "imap_cmd_move.h" #include "imap_cmd_move.h"
#include "imap_cmd_object_move.h" #include "imap_cmd_object_move.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h" #include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static void move_command_destruct(Command_t *parent); static void move_command_destruct(Command_t *parent);
static CmdExecuteValue_t move_command_execute(Command_t *parent); static CmdExecuteValue_t move_command_execute(Command_t *parent);
......
...@@ -21,11 +21,14 @@ ...@@ -21,11 +21,14 @@
* *
*/ */
#include "config.h"
#include "imap_cmd_copy.h" #include "imap_cmd_copy.h"
#include "imap_cmd_object_down.h" #include "imap_cmd_object_down.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h" #include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static CmdExecuteValue_t move_down_command_execute(Command_t *parent); static CmdExecuteValue_t move_down_command_execute(Command_t *parent);
static void move_down_command_undo(Command_t *parent); static void move_down_command_undo(Command_t *parent);
static void move_down_command_redo(Command_t *parent); static void move_down_command_redo(Command_t *parent);
......
...@@ -21,11 +21,14 @@ ...@@ -21,11 +21,14 @@
* *
*/ */
#include "config.h"
#include "imap_cmd_copy.h" #include "imap_cmd_copy.h"
#include "imap_cmd_edit_object.h" #include "imap_cmd_edit_object.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h" #include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
COMMAND_PROTO(move_sash_command); COMMAND_PROTO(move_sash_command);
CommandClass_t move_sash_command_class = { CommandClass_t move_sash_command_class = {
......
...@@ -21,10 +21,13 @@ ...@@ -21,10 +21,13 @@
* *
*/ */
#include "config.h"
#include "imap_cmd_move_selected.h" #include "imap_cmd_move_selected.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h" #include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static CmdExecuteValue_t move_selected_command_execute(Command_t *parent); static CmdExecuteValue_t move_selected_command_execute(Command_t *parent);
static void move_selected_command_undo(Command_t *parent); static void move_selected_command_undo(Command_t *parent);
......
...@@ -21,11 +21,15 @@ ...@@ -21,11 +21,15 @@
* *
*/ */
#include "config.h"
#include "imap_cmd_create.h" #include "imap_cmd_create.h"
#include "imap_cmd_delete.h" #include "imap_cmd_delete.h"
#include "imap_cmd_move_to_front.h" #include "imap_cmd_move_to_front.h"
#include "imap_main.h" #include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static CmdExecuteValue_t move_to_front_command_execute(Command_t *parent); static CmdExecuteValue_t move_to_front_command_execute(Command_t *parent);
static void move_to_front_command_undo(Command_t *parent); static void move_to_front_command_undo(Command_t *parent);
static void move_to_front_command_redo(Command_t *parent); static void move_to_front_command_redo(Command_t *parent);
...@@ -47,7 +51,7 @@ move_to_front_command_new(ObjectList_t *list) ...@@ -47,7 +51,7 @@ move_to_front_command_new(ObjectList_t *list)
{ {
MoveToFrontCommand_t *command = g_new(MoveToFrontCommand_t, 1); MoveToFrontCommand_t *command = g_new(MoveToFrontCommand_t, 1);
command->list = list; command->list = list;
return command_init(&command->parent, "Move To Front", return command_init(&command->parent, _("Move To Front"),
&move_to_front_command_class); &move_to_front_command_class);
} }
......
...@@ -21,11 +21,14 @@ ...@@ -21,11 +21,14 @@
* *
*/ */
#include "config.h"
#include "imap_cmd_move_up.h" #include "imap_cmd_move_up.h"
#include "imap_cmd_object_up.h" #include "imap_cmd_object_up.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h" #include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static CmdExecuteValue_t move_up_command_execute(Command_t *parent); static CmdExecuteValue_t move_up_command_execute(Command_t *parent);
static void move_up_command_undo(Command_t *parent); static void move_up_command_undo(Command_t *parent);
static void move_up_command_redo(Command_t *parent); static void move_up_command_redo(Command_t *parent);
......
...@@ -21,10 +21,13 @@ ...@@ -21,10 +21,13 @@
* *
*/ */
#include "config.h"
#include "imap_cmd_copy.h" #include "imap_cmd_copy.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h" #include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static void object_down_command_destruct(Command_t *parent); static void object_down_command_destruct(Command_t *parent);
static CmdExecuteValue_t object_down_command_execute(Command_t *parent); static CmdExecuteValue_t object_down_command_execute(Command_t *parent);
static void object_down_command_undo(Command_t *parent); static void object_down_command_undo(Command_t *parent);
......
...@@ -21,10 +21,13 @@ ...@@ -21,10 +21,13 @@
* *
*/ */
#include "config.h"
#include "imap_cmd_object_move.h" #include "imap_cmd_object_move.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h" #include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static void object_move_command_destruct(Command_t *parent); static void object_move_command_destruct(Command_t *parent);
static CmdExecuteValue_t object_move_command_execute(Command_t *parent); static CmdExecuteValue_t object_move_command_execute(Command_t *parent);
static void object_move_command_undo(Command_t *parent); static void object_move_command_undo(Command_t *parent);
......
...@@ -21,10 +21,13 @@ ...@@ -21,10 +21,13 @@
* *
*/ */
#include "config.h"
#include "imap_cmd_copy.h" #include "imap_cmd_copy.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h" #include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static void object_up_command_destruct(Command_t *parent); static void object_up_command_destruct(Command_t *parent);
static CmdExecuteValue_t object_up_command_execute(Command_t *parent); static CmdExecuteValue_t object_up_command_execute(Command_t *parent);
static void object_up_command_undo(Command_t *parent); static void object_up_command_undo(Command_t *parent);
......
...@@ -21,11 +21,14 @@ ...@@ -21,11 +21,14 @@
* *
*/ */
#include "config.h"
#include "imap_cmd_create.h" #include "imap_cmd_create.h"
#include "imap_cmd_paste.h" #include "imap_cmd_paste.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h" #include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static CmdExecuteValue_t paste_command_execute(Command_t *parent); static CmdExecuteValue_t paste_command_execute(Command_t *parent);
static CommandClass_t paste_command_class = { static CommandClass_t paste_command_class = {
......
...@@ -21,10 +21,13 @@ ...@@ -21,10 +21,13 @@
* *
*/ */
#include "config.h"
#include "imap_cmd_select.h" #include "imap_cmd_select.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h" #include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static void select_command_destruct(Command_t *parent); static void select_command_destruct(Command_t *parent);
static CmdExecuteValue_t select_command_execute(Command_t *parent); static CmdExecuteValue_t select_command_execute(Command_t *parent);
static void select_command_undo(Command_t *parent); static void select_command_undo(Command_t *parent);
......
...@@ -21,11 +21,14 @@ ...@@ -21,11 +21,14 @@
* *
*/ */
#include "config.h"
#include "imap_cmd_select.h" #include "imap_cmd_select.h"
#include "imap_cmd_select_all.h" #include "imap_cmd_select_all.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h" #include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static CmdExecuteValue_t select_all_command_execute(Command_t *parent); static CmdExecuteValue_t select_all_command_execute(Command_t *parent);
static void select_all_command_undo(Command_t *parent); static void select_all_command_undo(Command_t *parent);
static void select_all_command_redo(Command_t *parent); static void select_all_command_redo(Command_t *parent);
......
...@@ -21,12 +21,16 @@ ...@@ -21,12 +21,16 @@
* *
*/ */
#include "config.h"
#include "imap_cmd_select.h" #include "imap_cmd_select.h"
#include "imap_cmd_select_next.h" #include "imap_cmd_select_next.h"
#include "imap_cmd_unselect.h" #include "imap_cmd_unselect.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h" #include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static CmdExecuteValue_t select_next_command_execute(Command_t *parent); static CmdExecuteValue_t select_next_command_execute(Command_t *parent);
static void select_next_command_undo(Command_t *command); static void select_next_command_undo(Command_t *command);
static void select_next_command_redo(Command_t *command); static void select_next_command_redo(Command_t *command);
......
...@@ -21,11 +21,15 @@ ...@@ -21,11 +21,15 @@
* *
*/ */
#include "config.h"
#include "imap_cmd_select.h" #include "imap_cmd_select.h"
#include "imap_cmd_select_prev.h" #include "imap_cmd_select_prev.h"
#include "imap_cmd_unselect.h" #include "imap_cmd_unselect.h"
#include "imap_main.h" #include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static CmdExecuteValue_t select_prev_command_execute(Command_t *parent); static CmdExecuteValue_t select_prev_command_execute(Command_t *parent);
static void select_prev_command_undo(Command_t *command); static void select_prev_command_undo(Command_t *command);
static void select_prev_command_redo(Command_t *command); static void select_prev_command_redo(Command_t *command);
...@@ -47,7 +51,7 @@ select_prev_command_new(ObjectList_t *list) ...@@ -47,7 +51,7 @@ select_prev_command_new(ObjectList_t *list)
{ {
SelectPrevCommand_t *command = g_new(SelectPrevCommand_t, 1); SelectPrevCommand_t *command = g_new(SelectPrevCommand_t, 1);
command->list = list; command->list = list;
return command_init(&command->parent, "Select Previous", return command_init(&command->parent, _("Select Previous"),
&select_prev_command_class); &select_prev_command_class);
} }
......
...@@ -21,13 +21,16 @@ ...@@ -21,13 +21,16 @@
* *
*/ */
#include "config.h"
#include "imap_rectangle.h" #include "imap_rectangle.h"
#include "imap_cmd_select.h" #include "imap_cmd_select.h"
#include "imap_cmd_select_region.h" #include "imap_cmd_select_region.h"
#include "imap_cmd_unselect_all.h" #include "imap_cmd_unselect_all.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h" #include "imap_main.h"
#include "libgimp/stdplugins-intl.h"
static CmdExecuteValue_t select_region_command_execute(Command_t *parent); static CmdExecuteValue_t select_region_command_execute(Command_t *parent);
static void select_region_command_undo(Command_t *parent); static void select_region_command_undo(Command_t *parent);
static void select_region_command_redo(Command_t *parent); static void select_region_command_redo(Command_t *parent);
......
...@@ -21,12 +21,15 @@ ...@@ -21,12 +21,15 @@
* *
*/ */
#include "config.h"
#include "imap_cmd_create.h" #include "imap_cmd_create.h"
#include "imap_cmd_delete.h" #include "imap_cmd_delete.h"
#include "imap_cmd_send_to_back.h" #include "imap_cmd_send_to_back.h"
#include "libgimp/stdplugins-intl.h"
#include "imap_main.h" #include "imap_main.h"