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

app: remove gimp_display_shell_filter_new(), it's empty and useless

Browse Source 
(cherry picked from commit ec18b969a3)
This commit is contained in:
Michael Natterer
2019-07-25 09:55:55 +02:00
parent 520c5f4b69
commit adf308d10e
3 changed files with 16 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
app/display/gimpdisplayshell-filter.c
View File

@ -53,16 +53,12 @@ gimp_display_shell_filter_set (GimpDisplayShell *shell,
g_signal_handlers_disconnect_by_func (shell->filter_stack, g_signal_handlers_disconnect_by_func (shell->filter_stack,
gimp_display_shell_filter_changed, gimp_display_shell_filter_changed,
shell); shell);
g_object_unref (shell->filter_stack);
} }
shell->filter_stack = stack; g_set_object (&shell->filter_stack, stack);
if (shell->filter_stack) if (shell->filter_stack)
{ {
g_object_ref (shell->filter_stack);
g_signal_connect (shell->filter_stack, "changed", g_signal_connect (shell->filter_stack, "changed",
G_CALLBACK (gimp_display_shell_filter_changed), G_CALLBACK (gimp_display_shell_filter_changed),
shell); shell);
@ -90,42 +86,6 @@ gimp_display_shell_has_filter (GimpDisplayShell *shell)
return FALSE; return FALSE;
} }
GimpColorDisplayStack *
gimp_display_shell_filter_new (GimpDisplayShell *shell)
{
g_return_val_if_fail (GIMP_IS_DISPLAY_SHELL (shell), NULL);
#if 0
/* disabled because we use gimpdisplayshell-profile now, keep
* the code around for reference.
*/
if (config->display_module)
{
GType type = g_type_from_name (config->display_module);
if (g_type_is_a (type, GIMP_TYPE_COLOR_DISPLAY))
{
GimpColorDisplay *display;
GimpColorDisplayStack *stack;
display = g_object_new (type,
"color-config", config,
"color-managed", shell,
NULL);
stack = gimp_color_display_stack_new ();
gimp_color_display_stack_add (stack, display);
g_object_unref (display);
return stack;
}
}
#endif
return NULL;
}
/* private functions */ /* private functions */

3
app/display/gimpdisplayshell-filter.h
View File

@ -24,8 +24,5 @@ void gimp_display_shell_filter_set (GimpDisplayShell *shell,
gboolean gimp_display_shell_has_filter (GimpDisplayShell *shell); gboolean gimp_display_shell_has_filter (GimpDisplayShell *shell);
GimpColorDisplayStack *
gimp_display_shell_filter_new (GimpDisplayShell *shell);
#endif /* __GIMP_DISPLAY_SHELL_FILTER_H__ */ #endif /* __GIMP_DISPLAY_SHELL_FILTER_H__ */

42
app/display/gimpdisplayshell.c
View File

@ -381,21 +381,20 @@ gimp_display_shell_init (GimpDisplayShell *shell)
static void static void
gimp_display_shell_constructed (GObject *object) gimp_display_shell_constructed (GObject *object)
{ {
GimpDisplayShell *shell = GIMP_DISPLAY_SHELL (object); GimpDisplayShell *shell = GIMP_DISPLAY_SHELL (object);
GimpDisplayConfig *config; GimpDisplayConfig *config;
GimpImage *image; GimpImage *image;
GimpColorDisplayStack *filter; GtkWidget *main_vbox;
GtkWidget *main_vbox; GtkWidget *upper_hbox;
GtkWidget *upper_hbox; GtkWidget *right_vbox;
GtkWidget *right_vbox; GtkWidget *lower_hbox;
GtkWidget *lower_hbox; GtkWidget *inner_table;
GtkWidget *inner_table; GtkWidget *gtk_image;
GtkWidget *gtk_image; GimpAction *action;
GimpAction *action; gint image_width;
gint image_width; gint image_height;
gint image_height; gint shell_width;
gint shell_width; gint shell_height;
gint shell_height;
G_OBJECT_CLASS (parent_class)->constructed (object); G_OBJECT_CLASS (parent_class)->constructed (object);
@ -763,16 +762,6 @@ gimp_display_shell_constructed (GObject *object)
gtk_widget_show (GTK_WIDGET (shell->canvas)); gtk_widget_show (GTK_WIDGET (shell->canvas));
/* add display filters */
filter = gimp_display_shell_filter_new (shell);
if (filter)
{
gimp_display_shell_filter_set (shell, filter);
g_object_unref (filter);
}
if (image) if (image)
{ {
gimp_display_shell_connect (shell); gimp_display_shell_connect (shell);
@ -814,8 +803,7 @@ gimp_display_shell_dispose (GObject *object)
if (shell->selection) if (shell->selection)
gimp_display_shell_selection_free (shell); gimp_display_shell_selection_free (shell);
if (shell->filter_stack) gimp_display_shell_filter_set (shell, NULL);
gimp_display_shell_filter_set (shell, NULL);
if (shell->filter_idle_id) if (shell->filter_idle_id)
{ {