ooo-build r14456 - in trunk: . patches/dev300

[pmladek svn gnome org]

Author: pmladek
Date: Mon Nov  3 15:59:02 2008
New Revision: 14456
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14456&view=rev

Log:
2008-11-03  Petr Mladek  <pmladek suse cz>

	* patches/dev300/vcl-gtk-2.8-unsupported-link-colors.diff:
	* patches/dev300/apply: (applied only for SUSE-10.1) gtk-2.8 does not
	  know the link-color properties; do not try to read them to avoid
	  annoying warning messages (bnc#440514)



Added:
   trunk/patches/dev300/vcl-gtk-2.8-unsupported-link-colors.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Nov  3 15:59:02 2008
@@ -60,7 +60,7 @@
 SUSE-9.2  : NovellBase
 SUSE-9.3  : NovellBase
 SUSE-10.0 : NovellBase
-SUSE-10.1 : NovellBase, BerkeleyDB43, BrokenSystemNSS, Java14
+SUSE-10.1 : NovellBase, BerkeleyDB43, BrokenSystemNSS, Java14, GTK28
 SUSE-10.2 : NovellBase, BerkeleyDB43, EMFPlus, Java14, OpenGLTransitionsMesa703
 SUSE-10.3 : NovellBase, BerkeleyDB43, EMFPlus, Java14
 SUSE-11.0 : NovellBase, BerkeleyDB43, Gcc43, EMFPlus, CairoFonts
@@ -1118,6 +1118,12 @@
 # another fallback to load libhsqldb with JRE 1.4
 connectivity-load-libhsqldb-with-jre-1.4.diff, n#431360, pmladek
 
+[ GTK28 ]
+
+# gtk-2.8 does not know the link-color properties;
+# do not try to read them to avoid annoying warning messages
+vcl-gtk-2.8-unsupported-link-colors.diff, n#440514, pmladek
+
 [ NovellOnlyWin32 ]
 SectionOwner => tml
 

Added: trunk/patches/dev300/vcl-gtk-2.8-unsupported-link-colors.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/vcl-gtk-2.8-unsupported-link-colors.diff	Mon Nov  3 15:59:02 2008
@@ -0,0 +1,25 @@
+--- vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx.old	2008-06-16 16:30:38.000000000 +0200
++++ vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx	2008-11-03 16:39:51.000000000 +0100
+@@ -3180,22 +3180,6 @@ void GtkSalGraphics::updateSettings( All
+     aStyleSet.SetHighlightColor( aHighlightColor );
+     aStyleSet.SetHighlightTextColor( aHighlightTextColor );
+ 
+-    // hyperlink colors
+-    GdkColor *link_color = NULL;
+-    gtk_widget_style_get (m_pWindow, "link-color", &link_color, NULL);
+-    if (link_color)
+-    {
+-        aStyleSet.SetLinkColor(getColor(*link_color));
+-        gdk_color_free (link_color);
+-        link_color = NULL;
+-    }
+-    gtk_widget_style_get (m_pWindow, "visited-link-color", &link_color, NULL);
+-    if (link_color)
+-    {
+-        aStyleSet.SetVisitedLinkColor(getColor(*link_color));
+-        gdk_color_free (link_color);
+-    }
+-
+     // menu disabled entries handling
+     aStyleSet.SetSkipDisabledInMenus( TRUE );
+     // menu colors