From nobody@FreeBSD.org  Tue Jun 15 03:10:38 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 684D0106567A
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 15 Jun 2010 03:10:38 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 3DFDB8FC08
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 15 Jun 2010 03:10:38 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o5F3Abhl062268
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 15 Jun 2010 03:10:38 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o5F3Abwq062251;
	Tue, 15 Jun 2010 03:10:37 GMT
	(envelope-from nobody)
Message-Id: <201006150310.o5F3Abwq062251@www.freebsd.org>
Date: Tue, 15 Jun 2010 03:10:37 GMT
From: Warren Block <wblock@wonkity.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] gimp-app: fix status bar with gtk-2.20.1_2
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         147859
>Category:       ports
>Synopsis:       [patch] graphics/gimp-app: fix status bar with gtk-2.20.1_2
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    gnome
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 15 03:20:01 UTC 2010
>Closed-Date:    Thu Jun 24 17:13:05 UTC 2010
>Last-Modified:  Thu Jun 24 17:20:02 UTC 2010
>Originator:     Warren Block
>Release:        8-STABLE
>Organization:
>Environment:
FreeBSD lightning 8.1-PRERELEASE FreeBSD 8.1-PRERELEASE #0: Fri Jun 11 22:13:33 MDT 2010     root@lightning:/usr/obj/usr/src/sys/LIGHTNING  i386
>Description:
gimp-app-2.6.8_4,1 does not show a status bar with gtk-2.20.1_2.  Seems to be the bug described here: https://bugs.launchpad.net/ubuntu/+source/gimp/+bug/542916

Reworked patch is based on this: http://git.gnome.org/browse/gimp/commit/?id=a81dc5ead39ddc71de7a77ee5f6c01ac85022523

Seems to work, but needs more testing.  May not work with earlier gtk.
>How-To-Repeat:
Run gimp-app-2.6.8_4,1.  Look for status bar at bottom of screen with units and zoom percentage--it's missing.
>Fix:
Apply patch.

Patch attached with submission follows:

--- 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),


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->gnome 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Tue Jun 15 03:26:53 UTC 2010 
Responsible-Changed-Why:  
Fix synopsis and assign. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=147859 
State-Changed-From-To: open->closed 
State-Changed-By: mezz 
State-Changed-When: Thu Jun 24 17:12:47 UTC 2010 
State-Changed-Why:  
I have updated gimp to 2.6.9 and it has this bug fix included. Thanks for 
submit patch/report! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=147859 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/147859: commit references a PR
Date: Thu, 24 Jun 2010 17:12:23 +0000 (UTC)

 mezz        2010-06-24 17:12:10 UTC
 
   FreeBSD ports repository
 
   Modified files:
     graphics/gimp        Makefile 
     graphics/gimp-app    Makefile distinfo pkg-plist 
     graphics/py-gimp     Makefile 
   Log:
   Update to 2.6.9, it has a few of fixes with the up to date GTK+2. Only bugs
   fix with no new feature in this release, see here:
   
           http://developer.gimp.org/NEWS-2.6
   
   PR:             ports/147859
   Reported by:    Warren Block <wblock@wonkity.com>
   Feature safe:   yes
   
   Revision  Changes    Path
   1.247     +2 -2      ports/graphics/gimp-app/Makefile
   1.103     +3 -3      ports/graphics/gimp-app/distinfo
   1.129     +46 -26    ports/graphics/gimp-app/pkg-plist
   1.223     +2 -2      ports/graphics/gimp/Makefile
   1.14      +1 -1      ports/graphics/py-gimp/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
