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

Remove "gimp-" prefix from the shell's "icon" and "title" properties 

The prefix was needed because GtkWindow also has "icon" and "title"
properties.
This commit is contained in:
Michael Natterer 2009-09-29 22:20:12 +02:00
parent d046da90e2
commit 35588efaa1
5 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/display/gimpdisplayshell-icon.c
View File

@ -40,6 +40,7 @@ void
gimp_display_shell_icon_update (GimpDisplayShell *shell) gimp_display_shell_icon_update (GimpDisplayShell *shell)
{ {
GimpImage *image; GimpImage *image;
GdkPixbuf *pixbuf = NULL;
g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell)); g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
@ -48,7 +49,6 @@ gimp_display_shell_icon_update (GimpDisplayShell *shell)
if (image) if (image)
{ {
Gimp *gimp = shell->display->gimp; Gimp *gimp = shell->display->gimp;
GdkPixbuf *pixbuf;
gint width; gint width;
gint height; gint height;
gdouble factor = ((gdouble) gimp_image_get_height (image) / gdouble factor = ((gdouble) gimp_image_get_height (image) /
@ -68,13 +68,9 @@ gimp_display_shell_icon_update (GimpDisplayShell *shell)
pixbuf = gimp_viewable_get_pixbuf (GIMP_VIEWABLE (image), pixbuf = gimp_viewable_get_pixbuf (GIMP_VIEWABLE (image),
gimp_get_user_context (gimp), gimp_get_user_context (gimp),
width, height); width, height);
}
g_object_set (shell, "gimp-icon", pixbuf, NULL); g_object_set (shell, "icon", pixbuf, NULL);
}
else
{
g_object_set (shell, "gimp-icon", NULL, NULL);
}
} }
void void

6
app/display/gimpdisplayshell-title.c
View File

@ -109,16 +109,14 @@ gimp_display_shell_update_title_idle (gpointer data)
config->image_status_format); config->image_status_format);
g_object_set (shell, g_object_set (shell,
/* FIXME: "title" later */ "title", title,
"gimp-title", title,
"status", status, "status", status,
NULL); NULL);
} }
else else
{ {
g_object_set (shell, g_object_set (shell,
/* FIXME: "title" later */ "title", GIMP_NAME,
"gimp-title", GIMP_NAME,
"status", " ", "status", " ",
NULL); NULL);
} }

6
app/display/gimpdisplayshell.c
View File

@ -226,8 +226,7 @@ gimp_display_shell_class_init (GimpDisplayShellClass *klass)
GIMP_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
g_object_class_install_property (object_class, PROP_TITLE, g_object_class_install_property (object_class, PROP_TITLE,
/* FIXME: "title" later */ g_param_spec_string ("title", NULL, NULL,
g_param_spec_string ("gimp-title", NULL, NULL,
NULL, NULL,
GIMP_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
@ -237,8 +236,7 @@ gimp_display_shell_class_init (GimpDisplayShellClass *klass)
GIMP_PARAM_READWRITE)); GIMP_PARAM_READWRITE));
g_object_class_install_property (object_class, PROP_ICON, g_object_class_install_property (object_class, PROP_ICON,
/* FIXME: "icon" later */ g_param_spec_object ("icon", NULL, NULL,
g_param_spec_object ("gimp-icon", NULL, NULL,
GDK_TYPE_PIXBUF, GDK_TYPE_PIXBUF,
GIMP_PARAM_READWRITE)); GIMP_PARAM_READWRITE));

6
app/display/gimpimagewindow.c
View File

@ -896,15 +896,13 @@ gimp_image_window_switch_page (GtkNotebook *notebook,
g_signal_connect (private->active_shell, "scaled", g_signal_connect (private->active_shell, "scaled",
G_CALLBACK (gimp_image_window_shell_scaled), G_CALLBACK (gimp_image_window_shell_scaled),
window); window);
/* FIXME: "title" later */ g_signal_connect (private->active_shell, "notify::title",
g_signal_connect (private->active_shell, "notify::gimp-title",
G_CALLBACK (gimp_image_window_shell_title_notify), G_CALLBACK (gimp_image_window_shell_title_notify),
window); window);
g_signal_connect (private->active_shell, "notify::status", g_signal_connect (private->active_shell, "notify::status",
G_CALLBACK (gimp_image_window_shell_status_notify), G_CALLBACK (gimp_image_window_shell_status_notify),
window); window);
/* FIXME: "icon" later */ g_signal_connect (private->active_shell, "notify::icon",
g_signal_connect (private->active_shell, "notify::gimp-icon",
G_CALLBACK (gimp_image_window_shell_icon_notify), G_CALLBACK (gimp_image_window_shell_icon_notify),
window); window);

3
app/display/gimpstatusbar.c
View File

@ -766,8 +766,7 @@ gimp_statusbar_restore_window_title (GimpStatusbar *statusbar)
if (gimp_image_window_is_iconified (GIMP_IMAGE_WINDOW (toplevel))) if (gimp_image_window_is_iconified (GIMP_IMAGE_WINDOW (toplevel)))
{ {
/* FIXME title later */ g_object_notify (G_OBJECT (statusbar->shell), "title");
g_object_notify (G_OBJECT (statusbar->shell), "gimp-title");
} }
} }