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

app/core/gimpimage-grid.c app/core/gimpimage.[ch] removed the 

2003-10-14  Sven Neumann  <sven@gimp.org>

	* app/core/gimpimage-grid.c
	* app/core/gimpimage.[ch]
	* app/gui/grid-dialog.c: removed the "grid_changed" signal from
	GimpImage.

	* app/display/gimpdisplayshell-handlers.c: connect to
	notifications from the image grid instead.
This commit is contained in:
Sven Neumann 2003-10-14 15:37:21 +00:00 committed by Sven Neumann
parent 737da42437
commit 3ac7d14d19
7 changed files with 19 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2003-10-14 Sven Neumann <sven@gimp.org>
* app/core/gimpimage-grid.c
* app/core/gimpimage.[ch]
* app/gui/grid-dialog.c: removed the "grid_changed" signal from
GimpImage.
* app/display/gimpdisplayshell-handlers.c: connect to
notifications from the image grid instead.
2003-10-14 Sven Neumann <sven@gimp.org>
* app/config/gimpconfig-utils.[ch]: removed

3
app/core/gimpimage-grid.c
View File

@ -31,7 +31,6 @@
#include "gimpgrid.h"
#include "gimpimage.h"
#include "gimpimage-grid.h"
#include "gimpimage-undo.h"
#include "gimpimage-undo-push.h"
#include "gimp-intl.h"
@ -60,6 +59,4 @@ gimp_image_set_grid (GimpImage *gimage,
gimp_image_undo_push_image_grid (gimage, _("Grid"), gimage->grid);
gimp_config_sync (GIMP_CONFIG (grid), GIMP_CONFIG (gimage->grid), 0);
gimp_image_grid_changed (gimage);
}

19
app/core/gimpimage.c
View File

@ -81,7 +81,6 @@ enum
ACTIVE_VECTORS_CHANGED,
COMPONENT_VISIBILITY_CHANGED,
COMPONENT_ACTIVE_CHANGED,
GRID_CHANGED,
MASK_CHANGED,
RESOLUTION_CHANGED,
UNIT_CHANGED,
@ -280,15 +279,6 @@ gimp_image_class_init (GimpImageClass *klass)
G_TYPE_NONE, 1,
GIMP_TYPE_CHANNEL_TYPE);
gimp_image_signals[GRID_CHANGED] =
g_signal_new ("grid_changed",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (GimpImageClass, grid_changed),
NULL, NULL,
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
gimp_image_signals[MASK_CHANGED] =
g_signal_new ("mask_changed",
G_TYPE_FROM_CLASS (klass),
@ -430,7 +420,6 @@ gimp_image_class_init (GimpImageClass *klass)
viewable_class->get_new_preview = gimp_image_get_new_preview;
viewable_class->get_description = gimp_image_get_description;
klass->grid_changed = NULL;
klass->mode_changed = NULL;
klass->alpha_changed = NULL;
klass->floating_selection_changed = NULL;
@ -1382,14 +1371,6 @@ gimp_image_get_component_visible (const GimpImage *gimage,
return FALSE;
}
void
gimp_image_grid_changed (GimpImage *gimage)
{
g_return_if_fail (GIMP_IS_IMAGE (gimage));
g_signal_emit (gimage, gimp_image_signals[GRID_CHANGED], 0);
}
void
gimp_image_mode_changed (GimpImage *gimage)
{

2
app/core/gimpimage.h
View File

@ -181,7 +181,6 @@ struct _GimpImageClass
GimpChannelType channel);
void (* component_active_changed) (GimpImage *gimage,
GimpChannelType channel);
void (* grid_changed) (GimpImage *gimage);
void (* mask_changed) (GimpImage *gimage);
void (* resolution_changed) (GimpImage *gimage);
void (* unit_changed) (GimpImage *gimage);
@ -277,7 +276,6 @@ void gimp_image_set_component_visible (GimpImage *gimage,
gboolean gimp_image_get_component_visible (const GimpImage *gimage,
GimpChannelType type);
void gimp_image_grid_changed (GimpImage *gimage);
void gimp_image_mode_changed (GimpImage *gimage);
void gimp_image_alpha_changed (GimpImage *gimage);
void gimp_image_update (GimpImage *gimage,

17
app/dialogs/grid-dialog.c
View File

@ -54,10 +54,6 @@
/* local functions */
static void grid_notify_callback (GtkWidget *widget,
GParamSpec *pspec,
gpointer data);
static void reset_callback (GtkWidget *widget,
GtkWidget *dialog);
static void cancel_callback (GtkWidget *widget,
@ -107,10 +103,6 @@ grid_dialog_new (GimpImage *gimage)
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox),
editor);
g_signal_connect (grid, "notify",
G_CALLBACK (grid_notify_callback),
gimage);
gtk_widget_show (editor);
g_object_set_data (G_OBJECT (dialog), "gimage", gimage);
@ -126,14 +118,6 @@ grid_dialog_new (GimpImage *gimage)
/* local functions */
static void
grid_notify_callback (GtkWidget *widget,
GParamSpec *pspec,
gpointer data)
{
gimp_image_grid_changed (GIMP_IMAGE (data));
}
static void
reset_callback (GtkWidget *widget,
GtkWidget *dialog)
@ -146,7 +130,6 @@ reset_callback (GtkWidget *widget,
gimp_config_sync (GIMP_CONFIG (gimage->gimp->config->default_grid),
GIMP_CONFIG (grid), 0);
gimp_image_grid_changed (GIMP_IMAGE (gimage));
}
static void

16
app/display/gimpdisplayshell-handlers.c
View File

@ -54,7 +54,8 @@ static void gimp_display_shell_undo_event_handler (GimpImage *g
GimpUndoEvent event,
GimpUndo *undo,
GimpDisplayShell *shell);
static void gimp_display_shell_grid_changed_handler (GimpImage *gimage,
static void gimp_display_shell_grid_notify_handler (GimpGrid *grid,
GParamSpec *pspec,
GimpDisplayShell *shell);
static void gimp_display_shell_name_changed_handler (GimpImage *gimage,
GimpDisplayShell *shell);
@ -135,8 +136,8 @@ gimp_display_shell_connect (GimpDisplayShell *shell)
g_signal_connect (gimage, "undo_event",
G_CALLBACK (gimp_display_shell_undo_event_handler),
shell);
g_signal_connect (gimage, "grid_changed",
G_CALLBACK (gimp_display_shell_grid_changed_handler),
g_signal_connect (gimage->grid, "notify",
G_CALLBACK (gimp_display_shell_grid_notify_handler),
shell);
g_signal_connect (gimage, "name_changed",
G_CALLBACK (gimp_display_shell_name_changed_handler),
@ -314,8 +315,8 @@ gimp_display_shell_disconnect (GimpDisplayShell *shell)
g_signal_handlers_disconnect_by_func (gimage,
gimp_display_shell_name_changed_handler,
shell);
g_signal_handlers_disconnect_by_func (gimage,
gimp_display_shell_grid_changed_handler,
g_signal_handlers_disconnect_by_func (gimage->grid,
gimp_display_shell_grid_notify_handler,
shell);
g_signal_handlers_disconnect_by_func (gimage,
gimp_display_shell_undo_event_handler,
@ -345,8 +346,9 @@ gimp_display_shell_undo_event_handler (GimpImage *gimage,
}
static void
gimp_display_shell_grid_changed_handler (GimpImage *gimage,
GimpDisplayShell *shell)
gimp_display_shell_grid_notify_handler (GimpGrid *grid,
GParamSpec *pspec,
GimpDisplayShell *shell)
{
gimp_display_shell_expose_full (shell);

17
app/gui/grid-dialog.c
View File

@ -54,10 +54,6 @@
/* local functions */
static void grid_notify_callback (GtkWidget *widget,
GParamSpec *pspec,
gpointer data);
static void reset_callback (GtkWidget *widget,
GtkWidget *dialog);
static void cancel_callback (GtkWidget *widget,
@ -107,10 +103,6 @@ grid_dialog_new (GimpImage *gimage)
gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox),
editor);
g_signal_connect (grid, "notify",
G_CALLBACK (grid_notify_callback),
gimage);
gtk_widget_show (editor);
g_object_set_data (G_OBJECT (dialog), "gimage", gimage);
@ -126,14 +118,6 @@ grid_dialog_new (GimpImage *gimage)
/* local functions */
static void
grid_notify_callback (GtkWidget *widget,
GParamSpec *pspec,
gpointer data)
{
gimp_image_grid_changed (GIMP_IMAGE (data));
}
static void
reset_callback (GtkWidget *widget,
GtkWidget *dialog)
@ -146,7 +130,6 @@ reset_callback (GtkWidget *widget,
gimp_config_sync (GIMP_CONFIG (gimage->gimp->config->default_grid),
GIMP_CONFIG (grid), 0);
gimp_image_grid_changed (GIMP_IMAGE (gimage));
}
static void