callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

applied a patch from David Necas <yeti@physics.muni.cz> that fixes bug

Browse Source 
2003-02-10  Sven Neumann  <sven@gimp.org>

	* plug-ins/common/vpropagate.c: applied a patch from David Necas
	<yeti@physics.muni.cz> that fixes bug #105741.

	* plug-ins/common/uniteditor.c: cosmetics.
This commit is contained in:
Sven Neumann
2003-02-10 21:53:58 +00:00
committed by Sven Neumann
parent c0ec3a3161
commit 97ae2b8c03
4 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2003-02-10 Sven Neumann <sven@gimp.org>
* plug-ins/common/vpropagate.c: applied a patch from David Necas
<yeti@physics.muni.cz> that fixes bug #105741.
* plug-ins/common/uniteditor.c: cosmetics.
2003-02-10 Sven Neumann <sven@gimp.org> 2003-02-10 Sven Neumann <sven@gimp.org>
* plug-ins/common/gifload.c (DoExtension) * plug-ins/common/gifload.c (DoExtension)

8
devel-docs/libgimpwidgets/tmpl/gimpunitmenu.sgml
View File

@ -93,8 +93,10 @@ gimp_coordinates_new()
</para> </para>
@gum: @menu:
@unit: @unit:
<!-- # Unused Parameters # -->
@gum:
<!-- ##### FUNCTION gimp_unit_menu_get_unit ##### --> <!-- ##### FUNCTION gimp_unit_menu_get_unit ##### -->
@ -102,8 +104,10 @@ gimp_coordinates_new()
</para> </para>
@gum: @menu:
@Returns: @Returns:
<!-- # Unused Parameters # -->
@gum:
<!-- ##### SIGNAL GimpUnitMenu::unit-changed ##### --> <!-- ##### SIGNAL GimpUnitMenu::unit-changed ##### -->

38
plug-ins/common/uniteditor.c
View File

@ -345,15 +345,13 @@ new_unit (GtkWidget *main_dialog,
static void static void
list_init (GtkTreeView *tv) list_init (GtkTreeView *tv)
{ {
GtkListStore *list_store; GtkListStore *list_store;
GtkTreeSelection *sel; GtkTreeIter iter;
GtkTreeIter iter; gint num_units;
gint num_units; GimpUnit unit;
GimpUnit unit; GdkColor color;
GdkColor color;
list_store = GTK_LIST_STORE (gtk_tree_view_get_model (tv)); list_store = GTK_LIST_STORE (gtk_tree_view_get_model (tv));
sel = gtk_tree_view_get_selection (tv);
gtk_list_store_clear (list_store); gtk_list_store_clear (list_store);
@ -388,7 +386,7 @@ list_init (GtkTreeView *tv)
} }
if (gtk_tree_model_get_iter_root (GTK_TREE_MODEL (list_store), &iter)) if (gtk_tree_model_get_iter_root (GTK_TREE_MODEL (list_store), &iter))
gtk_tree_selection_select_iter (sel, &iter); gtk_tree_selection_select_iter (gtk_tree_view_get_selection (tv), &iter);
} }
static void static void
@ -577,7 +575,8 @@ unit_editor_dialog (void)
NULL); NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (tv), col); gtk_tree_view_append_column (GTK_TREE_VIEW (tv), col);
gimp_help_set_help_data (col->button, gettext (help_strings[SAVE]), NULL); gimp_help_set_help_data (col->button,
gettext (help_strings[SAVE]), NULL);
g_signal_connect (rend, "toggled", g_signal_connect (rend, "toggled",
G_CALLBACK (saved_toggled_callback), G_CALLBACK (saved_toggled_callback),
@ -590,7 +589,8 @@ unit_editor_dialog (void)
NULL); NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (tv), col); gtk_tree_view_append_column (GTK_TREE_VIEW (tv), col);
gimp_help_set_help_data (col->button, gettext (help_strings[IDENTIFIER]), NULL); gimp_help_set_help_data (col->button,
gettext (help_strings[IDENTIFIER]), NULL);
rend = gtk_cell_renderer_text_new (); rend = gtk_cell_renderer_text_new ();
col = gtk_tree_view_column_new_with_attributes (_("Factor"), rend, col = gtk_tree_view_column_new_with_attributes (_("Factor"), rend,
@ -598,7 +598,8 @@ unit_editor_dialog (void)
NULL); NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (tv), col); gtk_tree_view_append_column (GTK_TREE_VIEW (tv), col);
gimp_help_set_help_data (col->button, gettext (help_strings[FACTOR]), NULL); gimp_help_set_help_data (col->button,
gettext (help_strings[FACTOR]), NULL);
rend = gtk_cell_renderer_text_new (); rend = gtk_cell_renderer_text_new ();
col = gtk_tree_view_column_new_with_attributes (_("Digits"), rend, col = gtk_tree_view_column_new_with_attributes (_("Digits"), rend,
@ -606,7 +607,8 @@ unit_editor_dialog (void)
NULL); NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (tv), col); gtk_tree_view_append_column (GTK_TREE_VIEW (tv), col);
gimp_help_set_help_data (col->button, gettext (help_strings[DIGITS]), NULL); gimp_help_set_help_data (col->button,
gettext (help_strings[DIGITS]), NULL);
rend = gtk_cell_renderer_text_new (); rend = gtk_cell_renderer_text_new ();
col = gtk_tree_view_column_new_with_attributes (_("Symbol"), rend, col = gtk_tree_view_column_new_with_attributes (_("Symbol"), rend,
@ -614,7 +616,8 @@ unit_editor_dialog (void)
NULL); NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (tv), col); gtk_tree_view_append_column (GTK_TREE_VIEW (tv), col);
gimp_help_set_help_data (col->button, gettext (help_strings[SYMBOL]), NULL); gimp_help_set_help_data (col->button,
gettext (help_strings[SYMBOL]), NULL);
rend = gtk_cell_renderer_text_new (); rend = gtk_cell_renderer_text_new ();
col = gtk_tree_view_column_new_with_attributes (_("Abbreviation"), rend, col = gtk_tree_view_column_new_with_attributes (_("Abbreviation"), rend,
@ -622,7 +625,8 @@ unit_editor_dialog (void)
NULL); NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (tv), col); gtk_tree_view_append_column (GTK_TREE_VIEW (tv), col);
gimp_help_set_help_data (col->button, gettext (help_strings[ABBREVIATION]), NULL); gimp_help_set_help_data (col->button,
gettext (help_strings[ABBREVIATION]), NULL);
rend = gtk_cell_renderer_text_new (); rend = gtk_cell_renderer_text_new ();
col = gtk_tree_view_column_new_with_attributes (_("Singular"), rend, col = gtk_tree_view_column_new_with_attributes (_("Singular"), rend,
@ -630,7 +634,8 @@ unit_editor_dialog (void)
NULL); NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (tv), col); gtk_tree_view_append_column (GTK_TREE_VIEW (tv), col);
gimp_help_set_help_data (col->button, gettext (help_strings[SINGULAR]), NULL); gimp_help_set_help_data (col->button,
gettext (help_strings[SINGULAR]), NULL);
rend = gtk_cell_renderer_text_new (); rend = gtk_cell_renderer_text_new ();
col = gtk_tree_view_column_new_with_attributes (_("Plural"), rend, col = gtk_tree_view_column_new_with_attributes (_("Plural"), rend,
@ -638,7 +643,8 @@ unit_editor_dialog (void)
NULL); NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (tv), col); gtk_tree_view_append_column (GTK_TREE_VIEW (tv), col);
gimp_help_set_help_data (col->button, gettext (help_strings[PLURAL]), NULL); gimp_help_set_help_data (col->button,
gettext (help_strings[PLURAL]), NULL);
list_init (GTK_TREE_VIEW (tv)); list_init (GTK_TREE_VIEW (tv));

6
plug-ins/common/vpropagate.c
View File

@ -374,7 +374,7 @@ run (gchar *name,
strcmp(name, DEFAULT_PLUG_IN_NAME) != 0) strcmp(name, DEFAULT_PLUG_IN_NAME) != 0)
gimp_displays_flush(); gimp_displays_flush();
if (run_mode == GIMP_RUN_INTERACTIVE && status == GIMP_PDB_SUCCESS if (run_mode == GIMP_RUN_INTERACTIVE && status == GIMP_PDB_SUCCESS
&& strcmp(name, DEFAULT_PLUG_IN_NAME) != 0) && strcmp(name, DEFAULT_PLUG_IN_NAME) == 0)
gimp_set_data (DEFAULT_PLUG_IN_NAME, &vpvals, sizeof (VPValueType)); gimp_set_data (DEFAULT_PLUG_IN_NAME, &vpvals, sizeof (VPValueType));
values[0].type = GIMP_PDB_STATUS; values[0].type = GIMP_PDB_STATUS;
@ -518,9 +518,9 @@ prepare_row (GimpPixelRgn *pixel_rgn,
{ {
gint b; gint b;
if (y == 0) if (y <= 0)
gimp_pixel_rgn_get_row (pixel_rgn, data, x, (y + 1), w); gimp_pixel_rgn_get_row (pixel_rgn, data, x, (y + 1), w);
else if (y == pixel_rgn->h) else if (y >= pixel_rgn->h)
gimp_pixel_rgn_get_row (pixel_rgn, data, x, (y - 1), w); gimp_pixel_rgn_get_row (pixel_rgn, data, x, (y - 1), w);
else else
gimp_pixel_rgn_get_row (pixel_rgn, data, x, y, w); gimp_pixel_rgn_get_row (pixel_rgn, data, x, y, w);