From owner-svn-ports-head@freebsd.org Fri Feb 10 02:02:56 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 27DD5CD8C58; Fri, 10 Feb 2017 02:02:56 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DA654110F; Fri, 10 Feb 2017 02:02:55 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1A22sYn088602; Fri, 10 Feb 2017 02:02:54 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1A22sV5088600; Fri, 10 Feb 2017 02:02:54 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201702100202.v1A22sV5088600@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Fri, 10 Feb 2017 02:02:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433781 - in head/editors/libreoffice: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Feb 2017 02:02:56 -0000 Author: jkim Date: Fri Feb 10 02:02:54 2017 New Revision: 433781 URL: https://svnweb.freebsd.org/changeset/ports/433781 Log: Refine r433663. If "use-header-bar" property of the dialog is set to TRUE, it uses a GtkHeaderBar for action buttons instead of the action area and gtk_dialog_get_header_bar() should not return NULL. If it is set to FALSE, gtk_dialog_get_header_bar() always returns NULL. In other words, we should not remove buttons from both header bar and action area in any case. This patch also removes pointless assertions from the previous patch. PR: 203563 Modified: head/editors/libreoffice/Makefile head/editors/libreoffice/files/patch-vcl_unx_gtk_fpicker_SalGtkFilePicker.cxx Modified: head/editors/libreoffice/Makefile ============================================================================== --- head/editors/libreoffice/Makefile Fri Feb 10 00:23:05 2017 (r433780) +++ head/editors/libreoffice/Makefile Fri Feb 10 02:02:54 2017 (r433781) @@ -2,7 +2,7 @@ .include "${.CURDIR}/Makefile.common" -PORTREVISION= 4 +PORTREVISION= 5 MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${PORTVERSION}/ \ http://dev-www.libreoffice.org/src/:src \ http://dev-www.libreoffice.org/extern/:ext Modified: head/editors/libreoffice/files/patch-vcl_unx_gtk_fpicker_SalGtkFilePicker.cxx ============================================================================== --- head/editors/libreoffice/files/patch-vcl_unx_gtk_fpicker_SalGtkFilePicker.cxx Fri Feb 10 00:23:05 2017 (r433780) +++ head/editors/libreoffice/files/patch-vcl_unx_gtk_fpicker_SalGtkFilePicker.cxx Fri Feb 10 02:02:54 2017 (r433781) @@ -1,26 +1,16 @@ --- vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx.orig 2017-01-12 00:54:33 UTC +++ vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx -@@ -418,8 +418,11 @@ shrinkFilterName( const OUString &rFilte - static void - dialog_remove_buttons(GtkWidget *pActionArea) - { -- GList *pChildren = -- gtk_container_get_children( GTK_CONTAINER( pActionArea ) ); -+ GtkContainer *pContainer = GTK_CONTAINER( pActionArea ); -+ -+ g_return_if_fail( pContainer != nullptr ); -+ -+ GList *pChildren = gtk_container_get_children( pContainer ); - - for( GList *p = pChildren; p; p = p->next ) - { -@@ -436,10 +439,10 @@ dialog_remove_buttons( GtkDialog *pDialo +@@ -436,10 +436,13 @@ dialog_remove_buttons( GtkDialog *pDialo { g_return_if_fail( GTK_IS_DIALOG( pDialog ) ); -#if GTK_CHECK_VERSION(3,0,0) #if GTK_CHECK_VERSION(3,12,0) - dialog_remove_buttons(gtk_dialog_get_header_bar(pDialog)); +- dialog_remove_buttons(gtk_dialog_get_header_bar(pDialog)); ++ GtkWidget *pHeaderBar = gtk_dialog_get_header_bar( pDialog ); ++ if( pHeaderBar != nullptr ) ++ dialog_remove_buttons( pHeaderBar ); ++ else #endif +#if GTK_CHECK_VERSION(2,14,0) dialog_remove_buttons(gtk_dialog_get_action_area(pDialog));