From c3c63280d4a597f4901fe41db7dab22dd77bdb44 Mon Sep 17 00:00:00 2001 From: Wen-Yen Chuang Date: Mon, 12 Dec 2011 21:33:02 +0800 Subject: [PATCH] * l3afpad-0.8.18.1.2 --- ChangeLog | 9 +++++++-- autogen.sh | 1 + configure | 18 +++++++++--------- configure.ac | 2 +- src/callback.c | 1 + src/gtkprint.c | 4 ++-- src/main.c | 2 +- 7 files changed, 22 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index a99f74b..86d8569 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-09-05 + + version 0.8.18.1.2: + * Fix print function (This is a bug NOT in Leafpad, oops.) + 2011-09-01 version 0.8.18.1.1: @@ -220,7 +225,7 @@ version 0.7.6: * Improved command line recognition of filename (uri & space-separated). - * Added MimeType entry to l3afpad.desktop (suggested by Carlos). + * Added MimeType entry to leafpad.desktop (suggested by Carlos). * Assigned Ctrl+G & Shift+Ctrl+G to Find Next/Previous. * Added statements of copying permission to all source codes. * Added French translation (thanks Luc Pionchon). @@ -229,7 +234,7 @@ 2004-10-29 version 0.7.5: - * Added l3afpad.desktop file. + * Added leafpad.desktop file. * Fixed DnD with space-separated filename (thanks Eugenia). * Added Russian translation (thanks Artem Vakhitov). * Added Swedish translation (thanks Isak Savo). diff --git a/autogen.sh b/autogen.sh index 0796e01..a366b9e 100644 --- a/autogen.sh +++ b/autogen.sh @@ -3,3 +3,4 @@ aclocal autoheader automake --gnu --add-missing --copy autoconf +[ -d autom4te.cache ] && rm -fr autom4te.cache diff --git a/configure b/configure index 0562bfb..f9df795 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for L3afpad 0.8.18.1.1. +# Generated by GNU Autoconf 2.68 for L3afpad 0.8.18.1.2. # # Report bugs to . # @@ -560,8 +560,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='L3afpad' PACKAGE_TARNAME='l3afpad' -PACKAGE_VERSION='0.8.18.1.1' -PACKAGE_STRING='L3afpad 0.8.18.1.1' +PACKAGE_VERSION='0.8.18.1.2' +PACKAGE_STRING='L3afpad 0.8.18.1.2' PACKAGE_BUGREPORT='caleb@calno.com' PACKAGE_URL='' @@ -1296,7 +1296,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures L3afpad 0.8.18.1.1 to adapt to many kinds of systems. +\`configure' configures L3afpad 0.8.18.1.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1362,7 +1362,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of L3afpad 0.8.18.1.1:";; + short | recursive ) echo "Configuration of L3afpad 0.8.18.1.2:";; esac cat <<\_ACEOF @@ -1459,7 +1459,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -L3afpad configure 0.8.18.1.1 +L3afpad configure 0.8.18.1.2 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1828,7 +1828,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by L3afpad $as_me 0.8.18.1.1, which was +It was created by L3afpad $as_me 0.8.18.1.2, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -6928,7 +6928,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by L3afpad $as_me 0.8.18.1.1, which was +This file was extended by L3afpad $as_me 0.8.18.1.2, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6994,7 +6994,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -L3afpad config.status 0.8.18.1.1 +L3afpad config.status 0.8.18.1.2 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 4052be2..f116c51 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(L3afpad, 0.8.18.1.1, caleb@calno.com) +AC_INIT(L3afpad, 0.8.18.1.2, caleb@calno.com) AM_INIT_AUTOMAKE($PACKAGE_TARNAME, $PACKAGE_VERSION) AM_CONFIG_HEADER(config.h) diff --git a/src/callback.c b/src/callback.c index 0faa3d8..e2c1ec3 100644 --- a/src/callback.c +++ b/src/callback.c @@ -320,6 +320,7 @@ void on_help_about(void) NULL }; gtk_show_about_dialog(GTK_WINDOW(pub->mw->window), + "program-name", "Lɜafpad", "version", PACKAGE_VERSION, "copyright", copyright, "comments", comments, diff --git a/src/gtkprint.c b/src/gtkprint.c index 3cce6ca..815b893 100644 --- a/src/gtkprint.c +++ b/src/gtkprint.c @@ -20,7 +20,7 @@ #include static PangoLayout *layout; -static PangoFontDescription *font_desc; +static const PangoFontDescription *font_desc; static gint line_count, lines_per_page, text_height; static gint n_pages; static gdouble page_width, page_height; @@ -54,7 +54,7 @@ static void cb_begin_print(GtkPrintOperation *op, page_width = gtk_print_context_get_width(ctx); page_height = gtk_print_context_get_height(ctx); - gtk_widget_style_get_property(data, font_desc, font_desc); + font_desc = gtk_style_context_get_font(gtk_widget_get_style_context(data), GTK_STATE_FLAG_NORMAL); layout = gtk_print_context_create_pango_layout(ctx); pango_layout_set_width(layout, page_width * PANGO_SCALE); pango_layout_set_font_description(layout, font_desc); diff --git a/src/main.c b/src/main.c index 338f83f..46f6969 100644 --- a/src/main.c +++ b/src/main.c @@ -220,7 +220,7 @@ gint main(gint argc, gchar **argv) gtk_window_set_default_size( GTK_WINDOW(pub->mw->window), conf->width, conf->height); - set_text_font_by_name(pub->mw->view, conf->fontname); + set_text_font_by_name(pub->mw->view, conf->fontname); gtk_window_set_icon_from_file(GTK_WINDOW(pub->mw->window), ICONDIR"/l3afpad.png", NULL); ifactory = gtk_item_factory_from_widget(pub->mw->menubar);