Author: nick Date: 2009-06-29 09:04:52 +0000 (Mon, 29 Jun 2009) New Revision: 30125
Modified: terminal/branches/xfce_4_6/NEWS terminal/branches/xfce_4_6/doc/C/Terminal.xml.in terminal/branches/xfce_4_6/terminal/terminal-dialogs.h Log: Backport some fixes from trunk. Modified: terminal/branches/xfce_4_6/NEWS =================================================================== --- terminal/branches/xfce_4_6/NEWS 2009-06-29 07:15:06 UTC (rev 30124) +++ terminal/branches/xfce_4_6/NEWS 2009-06-29 09:04:52 UTC (rev 30125) @@ -3,7 +3,10 @@ - Fix segfault in special tab configuration (bug #3809). - Don't set contents change on resize (bug #5443). - Check for case problems when creating the symlink (bug #4431). +- Fix compilation under Solaris (bug #4581). +- Fix typos in documentation (bug #5411, bug #5451). + 0.2.12 ====== - Property destroy the go menu item when a terminal screen is closed Modified: terminal/branches/xfce_4_6/doc/C/Terminal.xml.in =================================================================== --- terminal/branches/xfce_4_6/doc/C/Terminal.xml.in 2009-06-29 07:15:06 UTC (rev 30124) +++ terminal/branches/xfce_4_6/doc/C/Terminal.xml.in 2009-06-29 09:04:52 UTC (rev 30125) @@ -208,7 +208,7 @@ <term><varname>TERM</varname></term> <listitem> <para>Set to <literal>xterm</literal> or <literal>xterm-color</literal>, you - can configured the value from the preferences dialog.</para> + can configure the value from the preferences dialog.</para> </listitem> </varlistentry> <varlistentry> @@ -864,7 +864,7 @@ <term><guilabel>Palette</guilabel></term> <listitem> <para>The terminal provides the application running inside with a palette of - 16 colors. You can customize this colors using the 16 color buttons.</para> + 16 colors. You can customize these colors using the 16 color buttons.</para> </listitem> </varlistentry> </variablelist> Modified: terminal/branches/xfce_4_6/terminal/terminal-dialogs.h =================================================================== --- terminal/branches/xfce_4_6/terminal/terminal-dialogs.h 2009-06-29 07:15:06 UTC (rev 30124) +++ terminal/branches/xfce_4_6/terminal/terminal-dialogs.h 2009-06-29 09:04:52 UTC (rev 30125) @@ -24,16 +24,16 @@ G_BEGIN_DECLS; -void terminal_dialogs_show_about (GtkWindow *parent) G_GNUC_INTERNAL; +void terminal_dialogs_show_about (GtkWindow *parent); void terminal_dialogs_show_error (gpointer parent, const GError *error, const gchar *format, - ...) G_GNUC_INTERNAL G_GNUC_PRINTF (3, 4); + ...) G_GNUC_PRINTF (3, 4); void terminal_dialogs_show_help (gpointer parent, const gchar *page, - const gchar *offset) G_GNUC_INTERNAL; + const gchar *offset); G_END_DECLS; _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits