Attachment 107144 Details for Bug 147859 – file.diff

[patch] file.diff

file.diff (text/plain), 1.82 KB, created by Warren Block on 2010-06-15 04:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Warren Block

Created: 2010-06-15 04:20:01 UTC

Size: 1.82 KB

patch

obsolete

>--- app/display/gimpstatusbar.c.orig	2010-06-14 20:33:45.000000000 -0600
>+++ app/display/gimpstatusbar.c	2010-06-14 20:44:51.000000000 -0600
>@@ -154,6 +154,8 @@
>   GtkWidget     *hbox;
>   GtkWidget     *image;
>   GimpUnitStore *store;
>+  GtkWidget	*message_area;
>+  GtkWidget	*message_area_parent;
> 
>   statusbar->shell          = NULL;
>   statusbar->messages       = NULL;
>@@ -171,12 +173,13 @@
>   statusbar->progress_active      = FALSE;
>   statusbar->progress_shown       = FALSE;
> 
>-  /* remove the label and insert a hbox */
>-  gtk_container_remove (GTK_CONTAINER (GTK_STATUSBAR (statusbar)->frame),
>-                        g_object_ref (GTK_STATUSBAR (statusbar)->label));
>+  /* remove the message area and insert a hbox */
>+  message_area = gtk_statusbar_get_message_area (GTK_STATUSBAR (statusbar));
>+  message_area_parent = gtk_widget_get_parent (message_area);
>+  gtk_container_remove (GTK_CONTAINER (message_area_parent), g_object_ref (message_area));
> 
>   hbox = gtk_hbox_new (FALSE, 1);
>-  gtk_container_add (GTK_CONTAINER (GTK_STATUSBAR (statusbar)->frame), hbox);
>+  gtk_container_add (GTK_CONTAINER (message_area_parent), hbox);
>   gtk_widget_show (hbox);
> 
>   statusbar->cursor_label = gtk_label_new ("8888, 8888");
>@@ -207,10 +210,9 @@
>                     G_CALLBACK (gimp_statusbar_scale_changed),
>                     statusbar);
> 
>-  /*  put the label back into our hbox  */
>-  gtk_box_pack_start (GTK_BOX (hbox),
>-                      GTK_STATUSBAR (statusbar)->label, TRUE, TRUE, 1);
>-  g_object_unref (GTK_STATUSBAR (statusbar)->label);
>+  /* put the message area back into our hbox */
>+  gtk_box_pack_start (GTK_BOX (hbox), message_area, TRUE, TRUE, 1);
>+  g_object_unref (message_area);
> 
>   g_signal_connect_after (GTK_STATUSBAR (statusbar)->label, "expose-event",
>                           G_CALLBACK (gimp_statusbar_label_expose),

Actions: View | Diff

Attachments on bug 147859: 107144