Steve Langasek ha scritto: > On Tue, Jan 16, 2007 at 02:11:36PM +0100, A Mennucc wrote: >> I uploaded gpr 0.11deb.etch1 in t-p-u > >> please let it into Etch; but, feel free to ask questions > > Hmm, I never said 'no' to the version that you had already uploaded to > unstable. It's far better to use unstable for updates when possible, > instead of t-p-u. > > Can you please add any other fixes you need to to unstable, and we'll > let that one through instead? > ok I uploaded gpr 0.12deb1 , and it was promptly autobuilt on all archs (but alpha) please consider hinting here follows the diff from 0.11deb (that is in etch) to 0.12deb1 (w/o the automake/autoconf autogenerated parts) a. ps: I have been using the new version of gpr for 10 days, with lprng, and I am really happy of it, I can reliably print duplex (and all other fancy PPD stuff) again; no more of the problems I described at the end of http://permalink.gmane.org/gmane.linux.debian.devel.release/13559
--- gpr-0.11deb/debian/changelog 2006-07-06 18:15:02.000000000 +0200
+++ gpr-0.12deb1/debian/changelog 2007-01-18 14:05:28.000000000 +0100
@@ -1,3 +1,24 @@
+gpr (0.12deb1) unstable; urgency=high
+
+ * do not block dialog sizes
+ (by calling deprecated gtk_window_set_policy())
+ * enable button in dialogs
+ * "gpr: [INTL:fr] French program translation update", thanks to
+ Jean-Luc Coulon (f5ibh) (Closes: #379918).
+ * Create debian/po/POTFILES.in ; run debconf-updatepo
+ * urgency high to replace 0.11deb in etch, see
+ http://permalink.gmane.org/gmane.linux.debian.devel.release/13559
+
+ -- A Mennucc1 <mennucc1@debian.org> Thu, 18 Jan 2007 12:29:15 +0100
+
+gpr (0.12deb) unstable; urgency=high
+
+ * avoid storing twice the configuration
+ * do not use uninitialized GError stuff
+ * updated auto* stuff
+
+ -- A Mennucc1 <mennucc1@debian.org> Mon, 12 Jan 2007 14:28:14 +0100
+
gpr (0.11deb) unstable; urgency=low
* do not send non UTF8 strings to GTK2
diff -ur gpr-0.11deb/configure.ac gpr-0.12deb1/configure.ac
--- gpr-0.11deb/configure.ac 2006-07-06 18:18:55.000000000 +0200
+++ gpr-0.12deb1/configure.ac 2007-01-12 16:41:29.000000000 +0100
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(gpr,1,mennucc1@debian.org)
-AM_INIT_AUTOMAKE(gpr, 0.10)
+AM_INIT_AUTOMAKE(gpr, 0.12deb)
AM_CONFIG_HEADER(config.h)
AC_CONFIG_SRCDIR([config.h.in])
@@ -12,7 +12,7 @@
WARNS=""
AC_ARG_ENABLE(debug,
[ --enable-debug turn on debugging (assumes gcc/gdb) [default=no]],
-WARNS="-W -Wall -Wundef -Wpointer-arith -Wbad-function-cast -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline -Wshadow -O0 -ggdb3")
+WARNS="-W -Wall -Wundef -Wpointer-arith -Wbad-function-cast -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Winline -Wshadow -O0 -g")
AC_SUBST(WARNS)
dnl CFLAGS="$CFLAGS -I/usr/include/libppd"
@@ -124,7 +124,6 @@
dnl macros/Makefile
AC_OUTPUT([
-m4/Makefile
po/Makefile.in
Makefile
src/Makefile
diff -ur gpr-0.11deb/debian/changelog gpr-0.12deb1/debian/changelog
diff -ur gpr-0.11deb/debian/po/ca.po gpr-0.12deb1/debian/po/ca.po
--- gpr-0.11deb/debian/po/ca.po 2005-06-05 10:02:55.000000000 +0200
+++ gpr-0.12deb1/debian/po/ca.po 2007-01-18 14:02:03.000000000 +0100
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: gpr_0.9deb-2_templates\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-25 08:43-0800\n"
+"Report-Msgid-Bugs-To: mennucc1@debian.org\n"
+"POT-Creation-Date: 2007-01-18 14:02+0100\n"
"PO-Revision-Date: 2004-04-04 19:46GMT\n"
"Last-Translator: Aleix Badia i Bosch <abadia@ica.es>\n"
"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -16,13 +16,13 @@
#. Type: boolean
#. Description
-#: ../templates:4
+#: ../templates:1001
msgid "divert lpr with a wrapper that points to gpr?"
msgstr "voleu desviar l'lpr amb un embolcall que apunti al gpr?"
#. Type: boolean
#. Description
-#: ../templates:4
+#: ../templates:1001
msgid ""
"gpr can install a wrapper in place of the command lpr. The wrapper will call "
"the real lpr command if: either it is called from a terminal, or there is no "
diff -ur gpr-0.11deb/debian/po/cs.po gpr-0.12deb1/debian/po/cs.po
--- gpr-0.11deb/debian/po/cs.po 2005-06-05 10:02:55.000000000 +0200
+++ gpr-0.12deb1/debian/po/cs.po 2007-01-18 14:02:03.000000000 +0100
@@ -14,8 +14,8 @@
msgid ""
msgstr ""
"Project-Id-Version: gpr\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-25 08:43-0800\n"
+"Report-Msgid-Bugs-To: mennucc1@debian.org\n"
+"POT-Creation-Date: 2007-01-18 14:02+0100\n"
"PO-Revision-Date: 2005-05-26 19:54+0200\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -25,13 +25,13 @@
#. Type: boolean
#. Description
-#: ../templates:4
+#: ../templates:1001
msgid "divert lpr with a wrapper that points to gpr?"
msgstr "Obalit lpr skriptem, který ukazuje na gpr?"
#. Type: boolean
#. Description
-#: ../templates:4
+#: ../templates:1001
msgid ""
"gpr can install a wrapper in place of the command lpr. The wrapper will call "
"the real lpr command if: either it is called from a terminal, or there is no "
diff -ur gpr-0.11deb/debian/po/de.po gpr-0.12deb1/debian/po/de.po
--- gpr-0.11deb/debian/po/de.po 2005-06-05 10:02:56.000000000 +0200
+++ gpr-0.12deb1/debian/po/de.po 2007-01-18 14:02:03.000000000 +0100
@@ -14,8 +14,8 @@
msgid ""
msgstr ""
"Project-Id-Version: gpr_0.9deb-2_templates\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-25 08:43-0800\n"
+"Report-Msgid-Bugs-To: mennucc1@debian.org\n"
+"POT-Creation-Date: 2007-01-18 14:02+0100\n"
"PO-Revision-Date: 2004-06-06 22:15+0200\n"
"Last-Translator: Erik Schanze <mail@erikschanze.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -26,13 +26,13 @@
#. Type: boolean
#. Description
-#: ../templates:4
+#: ../templates:1001
msgid "divert lpr with a wrapper that points to gpr?"
msgstr "Kommando lpr nach gpr umleiten?"
#. Type: boolean
#. Description
-#: ../templates:4
+#: ../templates:1001
msgid ""
"gpr can install a wrapper in place of the command lpr. The wrapper will call "
"the real lpr command if: either it is called from a terminal, or there is no "
diff -ur gpr-0.11deb/debian/po/fr.po gpr-0.12deb1/debian/po/fr.po
--- gpr-0.11deb/debian/po/fr.po 2005-06-05 10:02:57.000000000 +0200
+++ gpr-0.12deb1/debian/po/fr.po 2007-01-18 14:02:03.000000000 +0100
@@ -14,8 +14,8 @@
msgid ""
msgstr ""
"Project-Id-Version: gpr 0.9deb-2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-25 08:43-0800\n"
+"Report-Msgid-Bugs-To: mennucc1@debian.org\n"
+"POT-Creation-Date: 2007-01-18 14:02+0100\n"
"PO-Revision-Date: 2004-03-08 21:42+0100\n"
"Last-Translator: Rémi Pannequin <remi.pannequin@laposte.net>\n"
"Language-Team: French <debian-l10n-french@debian.lists.org>\n"
@@ -27,7 +27,7 @@
# . Description
#. Type: boolean
#. Description
-#: ../templates:4
+#: ../templates:1001
msgid "divert lpr with a wrapper that points to gpr?"
msgstr "Faut-il rediriger les appels à lpr vers gpr ?"
@@ -35,7 +35,7 @@
# . Description
#. Type: boolean
#. Description
-#: ../templates:4
+#: ../templates:1001
msgid ""
"gpr can install a wrapper in place of the command lpr. The wrapper will call "
"the real lpr command if: either it is called from a terminal, or there is no "
diff -ur gpr-0.11deb/debian/po/ja.po gpr-0.12deb1/debian/po/ja.po
--- gpr-0.11deb/debian/po/ja.po 2005-06-05 10:02:58.000000000 +0200
+++ gpr-0.12deb1/debian/po/ja.po 2007-01-18 14:02:03.000000000 +0100
@@ -15,8 +15,8 @@
msgid ""
msgstr ""
"Project-Id-Version: gpr 0.9deb-3\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-25 08:43-0800\n"
+"Report-Msgid-Bugs-To: mennucc1@debian.org\n"
+"POT-Creation-Date: 2007-01-18 14:02+0100\n"
"PO-Revision-Date: 2004-11-19 17:53+0900\n"
"Last-Translator: Hideki Yamane <henrich@samba.gr.jp>\n"
"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -26,13 +26,13 @@
#. Type: boolean
#. Description
-#: ../templates:4
+#: ../templates:1001
msgid "divert lpr with a wrapper that points to gpr?"
msgstr "lpr ¤ò gpr ¤Î¥é¥Ã¥Ñ¡¼¤ÇÃÖ¤´¹¤¨¤Þ¤¹¤«?"
#. Type: boolean
#. Description
-#: ../templates:4
+#: ../templates:1001
msgid ""
"gpr can install a wrapper in place of the command lpr. The wrapper will call "
"the real lpr command if: either it is called from a terminal, or there is no "
diff -ur gpr-0.11deb/debian/po/nl.po gpr-0.12deb1/debian/po/nl.po
--- gpr-0.11deb/debian/po/nl.po 2005-06-05 10:02:58.000000000 +0200
+++ gpr-0.12deb1/debian/po/nl.po 2007-01-18 14:02:03.000000000 +0100
@@ -14,8 +14,8 @@
msgid ""
msgstr ""
"Project-Id-Version: gpr 0.9deb-2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-25 08:43-0800\n"
+"Report-Msgid-Bugs-To: mennucc1@debian.org\n"
+"POT-Creation-Date: 2007-01-18 14:02+0100\n"
"PO-Revision-Date: 2004-08-01 14:33+0100\n"
"Last-Translator: Luk Claes <luk.claes@ugent.be>\n"
"Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -25,13 +25,13 @@
#. Type: boolean
#. Description
-#: ../templates:4
+#: ../templates:1001
msgid "divert lpr with a wrapper that points to gpr?"
msgstr "lpr omleiden met een wrapper die naar gpr wijst?"
#. Type: boolean
#. Description
-#: ../templates:4
+#: ../templates:1001
msgid ""
"gpr can install a wrapper in place of the command lpr. The wrapper will call "
"the real lpr command if: either it is called from a terminal, or there is no "
Only in gpr-0.12deb1/debian/po: POTFILES.in
diff -ur gpr-0.11deb/debian/po/sv.po gpr-0.12deb1/debian/po/sv.po
--- gpr-0.11deb/debian/po/sv.po 2006-04-22 11:30:42.000000000 +0200
+++ gpr-0.12deb1/debian/po/sv.po 2007-01-18 14:02:03.000000000 +0100
@@ -13,24 +13,24 @@
msgid ""
msgstr ""
"Project-Id-Version: gpr 0.9deb-6\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-25 08:43-0800\n"
+"Report-Msgid-Bugs-To: mennucc1@debian.org\n"
+"POT-Creation-Date: 2007-01-18 14:02+0100\n"
"PO-Revision-Date: 2005-10-04 19:39+0200\n"
"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
"Language-Team: Swedish <sv@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
#. Type: boolean
#. Description
-#: ../templates:4
+#: ../templates:1001
msgid "divert lpr with a wrapper that points to gpr?"
msgstr "Dirigera lpr med en wrapper som pekar på gpr?"
#. Type: boolean
#. Description
-#: ../templates:4
+#: ../templates:1001
msgid ""
"gpr can install a wrapper in place of the command lpr. The wrapper will call "
"the real lpr command if: either it is called from a terminal, or there is no "
@@ -40,8 +40,8 @@
"printer-related settings."
msgstr ""
"gpr kan installera en 'wrapper' framför kommandot lpr. Wrappern kommer att "
-"kalla på det riktiga lpr-kommandot om: det kallas upp från en terminal eller det "
-"inte finns tillgång till en X-DISPLAY, annars kommer den kalla upp gpr. Denna "
-"wrapper kan vara användbar vid utskrifter från grafiska program (såsom mozilla "
-"eller openoffice) så att användare kan välja skrivare och andra skrivarrelaterade inställningar."
-
+"kalla på det riktiga lpr-kommandot om: det kallas upp från en terminal eller "
+"det inte finns tillgång till en X-DISPLAY, annars kommer den kalla upp gpr. "
+"Denna wrapper kan vara användbar vid utskrifter från grafiska program (såsom "
+"mozilla eller openoffice) så att användare kan välja skrivare och andra "
+"skrivarrelaterade inställningar."
diff -ur gpr-0.11deb/debian/po/templates.pot gpr-0.12deb1/debian/po/templates.pot
--- gpr-0.11deb/debian/po/templates.pot 2005-03-17 00:05:18.000000000 +0100
+++ gpr-0.12deb1/debian/po/templates.pot 2007-01-18 14:02:03.000000000 +0100
@@ -1,22 +1,14 @@
-#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-#
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-# Developers do not need to manually edit POT or PO files.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-25 08:43-0800\n"
+"Report-Msgid-Bugs-To: mennucc1@debian.org\n"
+"POT-Creation-Date: 2007-01-18 14:02+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,13 +18,13 @@
#. Type: boolean
#. Description
-#: ../templates:4
+#: ../templates:1001
msgid "divert lpr with a wrapper that points to gpr?"
msgstr ""
#. Type: boolean
#. Description
-#: ../templates:4
+#: ../templates:1001
msgid ""
"gpr can install a wrapper in place of the command lpr. The wrapper will call "
"the real lpr command if: either it is called from a terminal, or there is no "
diff -ur gpr-0.11deb/debian/po/vi.po gpr-0.12deb1/debian/po/vi.po
--- gpr-0.11deb/debian/po/vi.po 2005-06-05 10:02:59.000000000 +0200
+++ gpr-0.12deb1/debian/po/vi.po 2007-01-18 14:02:03.000000000 +0100
@@ -5,8 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: gpr 0.9deb-5\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-25 08:43-0800\n"
+"Report-Msgid-Bugs-To: mennucc1@debian.org\n"
+"POT-Creation-Date: 2007-01-18 14:02+0100\n"
"PO-Revision-Date: 2005-06-04 11:26+0930\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -17,13 +17,13 @@
#. Type: boolean
#. Description
-#: ../templates:4
+#: ../templates:1001
msgid "divert lpr with a wrapper that points to gpr?"
msgstr "là m tr�ch h�ng lpr dùng m�t b� bao b�c ch� t�i gpr không?"
#. Type: boolean
#. Description
-#: ../templates:4
+#: ../templates:1001
msgid ""
"gpr can install a wrapper in place of the command lpr. The wrapper will call "
"the real lpr command if: either it is called from a terminal, or there is no "
Only in gpr-0.11deb/m4: ChangeLog
Only in gpr-0.11deb/m4: codeset.m4
Only in gpr-0.11deb/m4: gettext.m4
Only in gpr-0.11deb/m4: glibc21.m4
Only in gpr-0.11deb/m4: glibc2.m4
Only in gpr-0.11deb/m4: iconv.m4
Only in gpr-0.11deb/m4: intdiv0.m4
Only in gpr-0.11deb/m4: intmax.m4
Only in gpr-0.11deb/m4: inttypes_h.m4
Only in gpr-0.11deb/m4: inttypes.m4
Only in gpr-0.11deb/m4: inttypes-pri.m4
Only in gpr-0.11deb/m4: isc-posix.m4
Only in gpr-0.11deb/m4: lcmessage.m4
Only in gpr-0.11deb/m4: lib-ld.m4
Only in gpr-0.11deb/m4: lib-link.m4
Only in gpr-0.11deb/m4: lib-prefix.m4
Only in gpr-0.11deb/m4: longdouble.m4
Only in gpr-0.11deb/m4: longlong.m4
Only in gpr-0.11deb/m4: Makefile.am
Only in gpr-0.11deb/m4: Makefile.in
Only in gpr-0.11deb/m4: nls.m4
Only in gpr-0.11deb/m4: po.m4
Only in gpr-0.11deb/m4: printf-posix.m4
Only in gpr-0.11deb/m4: progtest.m4
Only in gpr-0.11deb/m4: signed.m4
Only in gpr-0.11deb/m4: size_max.m4
Only in gpr-0.11deb/m4: stdint_h.m4
Only in gpr-0.11deb/m4: uintmax_t.m4
Only in gpr-0.11deb/m4: ulonglong.m4
Only in gpr-0.11deb/m4: wchar_t.m4
Only in gpr-0.11deb/m4: wint_t.m4
Only in gpr-0.11deb/m4: xsize.m4
diff -ur gpr-0.11deb/Makefile.am gpr-0.12deb1/Makefile.am
--- gpr-0.11deb/Makefile.am 2005-03-20 10:46:28.000000000 +0100
+++ gpr-0.12deb1/Makefile.am 2007-01-12 16:37:31.000000000 +0100
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = m4 po pixmaps src
+SUBDIRS = po pixmaps src
EXTRA_DIST= mkinstalldirs config.rpath gpr.spec.in intl
dist-hook:
diff -ur gpr-0.11deb/po/fr.po gpr-0.12deb1/po/fr.po
--- gpr-0.11deb/po/fr.po 2006-04-24 16:36:30.000000000 +0200
+++ gpr-0.12deb1/po/fr.po 2007-01-18 11:54:16.000000000 +0100
@@ -7,7 +7,7 @@
"Project-Id-Version: gpr\n"
"Report-Msgid-Bugs-To: mennucc1@debian.org\n"
"POT-Creation-Date: 2006-04-24 16:36+0200\n"
-"PO-Revision-Date: 2005-11-14 17:12+0100\n"
+"PO-Revision-Date: 2006-07-26 12:44+0200\n"
"Last-Translator: Jean-Luc Coulon (f5ibh) <jean-luc.coulon@wanadoo.fr>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
"MIME-Version: 1.0\n"
@@ -48,7 +48,7 @@
#: src/main.c:159
msgid "error initializing GTK"
-msgstr ""
+msgstr "erreur d'initialisation de GTK"
#: src/interface.c:221
msgid "gpr"
@@ -64,7 +64,7 @@
#: src/interface.c:273
msgid "Choose a file"
-msgstr ""
+msgstr "Choisir un fichier"
#: src/interface.c:357
msgid "Select Printer"
@@ -75,9 +75,8 @@
msgstr "Fichier PPD"
#: src/interface.c:410 src/interface.c:413
-#, fuzzy
msgid "Select a PPD File"
-msgstr "Imprimante"
+msgstr "Choisir un fichier PPD"
#: src/interface.c:526
msgid "Printer Configuration"
@@ -173,7 +172,7 @@
#: src/interface.c:1272
msgid "Common Options"
-msgstr "Options communes"
+msgstr "Options courantes"
#: src/interface.c:1306
msgid "Printer"
@@ -315,40 +314,3 @@
#: src/support.c:111
msgid "Couldn't create pixmap from data."
msgstr "Impossible de créer l'image à partir des données."
-
-#~ msgid "Couldn't create replacement pixmap."
-#~ msgstr "Impossible de créer l'image de remplacement."
-
-#~ msgid "Couldn't find pixmap file: %s"
-#~ msgstr "Impossible de trouver le fichier image : %s"
-
-#~ msgid "Couldn't create pixmap from file: %s"
-#~ msgstr "Impossible de créer l'image à partir du fichier : %s"
-
-#~ msgid "title = %s\n"
-#~ msgstr "titre = %s\n"
-
-#~ msgid "pattern = %s\n"
-#~ msgstr "motif = %s\n"
-
-#~ msgid "regexp = %d\n"
-#~ msgstr "expression rationnelle = %d\n"
-
-#~ msgid "string = %s\n"
-#~ msgstr "chaîne = %s\n"
-
-#~ msgid "out of memory\n"
-#~ msgstr "mémoire insuffisante\n"
-
-#~ msgid "empty document\n"
-#~ msgstr "document vide\n"
-
-#~ msgid "Document of the wrong type\n"
-#~ msgstr "Type de document incorrect\n"
-
-#~ msgid "document of the wrong type, Tabs expected, found (%s)\n"
-#~ msgstr ""
-#~ "type de document incorrect, des tabulations sont attendues, trouvé (%s)\n"
-
-#~ msgid "[%s] matches [%s]\n"
-#~ msgstr "[%s] correspond à [%s]\n"
diff -ur gpr-0.11deb/src/callbacks.c gpr-0.12deb1/src/callbacks.c
--- gpr-0.11deb/src/callbacks.c 2006-07-06 14:12:11.000000000 +0200
+++ gpr-0.12deb1/src/callbacks.c 2007-01-18 11:58:40.000000000 +0100
@@ -64,17 +64,38 @@
#define MAX_TABS 25
#define NUM_STANDARD_TABS 3
+/* puts data exactly in position
+ (basilarly, the original authors should have used an array) */
+static GSList* my_g_slist_replace(GSList *list,
+ gpointer data,
+ gint position)
+{
+ GSList* obj=g_slist_nth(list,position);
+ g_assert( position <= g_slist_length(list) );
+ if(obj) {
+ if(obj->data) g_free(obj->data);
+ obj->data=data;
+ } else
+ list=g_slist_insert(list,data,position);
+ return list;
+}
+
+
void revalidate_utf8(gchar *str)
{
extern int debug_on;
gchar *end_valid;
if ( ! g_utf8_validate (str, -1, &end_valid ) ) {
- gsize bytes_read, bytes_written; GError *error;
+ gsize bytes_read, bytes_written; GError *error=NULL;
if (debug_on) printf(" Non UTF8 string '%s' at char '%c' ",str, *end_valid );
gchar * new = g_locale_to_utf8(str, -1, &bytes_read, &bytes_written, &error );
+ //truncate originalstring
*end_valid=0;
- //FIXME should hook to encoding in PPD file, and really convert....
+ if (debug_on)
+ printf(" Non UTF8 string truncated to '%s' \n", str);
if (debug_on) printf(" truncated to '%s' ; may be converted to '%s' \n ",str,new);
+ //FIXME this code is now mostly useless:
+ // should hook to encoding in PPD file, and really convert....
//*str=new;
}
}
@@ -729,7 +750,6 @@
gchar *current_option; /* the string for the current option */
FILE *last_used; /* file containing list of last used settings */
GSList *olist, *clist;
- ppd_struct *local_ppd=ppd; /* local copy of ppd struct */
last_used = fopen((char *)
g_strconcat(local_ppd->config_dir, "/.lastused.sett", NULL),
@@ -1320,10 +1340,7 @@
* spot in the linked list
*/
local_ppd->choice_list =
- g_slist_remove(local_ppd->choice_list,
- g_slist_nth_data(local_ppd->choice_list, index));
- local_ppd->choice_list =
- g_slist_insert(local_ppd->choice_list, combined_string, index);
+ my_g_slist_replace(local_ppd->choice_list, combined_string, index);
/*
* To check for conflicts, we will build a hash table of conflicts
@@ -1403,11 +1420,7 @@
* spot in the linked list
*/
local_ppd->inst_opt_list =
- g_slist_remove(local_ppd->inst_opt_list,
- g_slist_nth_data(local_ppd->inst_opt_list, index));
- local_ppd->inst_opt_list =
- g_slist_insert(local_ppd->inst_opt_list, combined_string, index);
-
+ my_g_slist_replace(local_ppd->inst_opt_list, combined_string, index);
/*
* To check for conflicts, we will build a hash table(?) of conflicts
@@ -1469,12 +1482,11 @@
temp_string =
g_strjoin(":", option->keyword->str, choice->choice->str, NULL);
if (inst_opt)
- local_ppd->inst_opt_list =
- g_slist_insert(local_ppd->inst_opt_list, temp_string, count);
- else {
- local_ppd->choice_list =
- g_slist_insert(local_ppd->choice_list, temp_string, count);
- }
+ local_ppd->inst_opt_list=
+ my_g_slist_replace(local_ppd->inst_opt_list,temp_string,count);
+ else
+ local_ppd->choice_list=
+ my_g_slist_replace(local_ppd->choice_list,temp_string,count);
}
return;
diff -ur gpr-0.11deb/src/interface.c gpr-0.12deb1/src/interface.c
--- gpr-0.11deb/src/interface.c 2006-07-06 18:31:19.000000000 +0200
+++ gpr-0.12deb1/src/interface.c 2007-01-18 12:00:45.000000000 +0100
@@ -122,7 +122,7 @@
GtkWidget *hbox3;
GtkWidget *ppdfile_label;
GtkWidget *ppdfile_fileentry;
- GtkWidget *ppd_gnome_combo;
+ /*GtkWidget *ppd_gnome_combo;*/
GtkWidget *hbox4;
GtkWidget *hbox5;
GtkWidget *vbox3;
@@ -219,8 +219,6 @@
contents */
// this is a bad idea gtk_widget_set_usize(gpr_main_window, 500, 0);
gtk_window_set_title(GTK_WINDOW(gpr_main_window), _("gpr"));
- /* MLP: changed the following to allow window resizing. */
- gtk_window_set_policy(GTK_WINDOW(gpr_main_window), TRUE, TRUE, FALSE);
/* add a vbox to the window containing a notebook and a button
box */
@@ -1391,6 +1389,8 @@
/* now force the ppd_file entry to emit an activate signal to
handle inititialization * on startup */
+
+#ifndef FIXME_SHOULD_PROBABLY_DISABLE_THIS
#ifdef USE_GNOMEFILEENTRY
gtk_signal_emit_by_name(GTK_OBJECT(gnome_file_entry_gtk_entry
(GNOME_FILE_ENTRY(ppdfile_fileentry)))
@@ -1398,7 +1398,7 @@
#else
gtk_signal_emit_by_name(GTK_OBJECT(ppdfile_fileentry),"selection-changed");
#endif
-
+#endif
return gpr_main_window;
}
@@ -1429,8 +1429,6 @@
//this is a bad idea gtk_widget_set_usize(gpr_inst_options_window, 500, 295);
gtk_window_set_title(GTK_WINDOW(gpr_inst_options_window),
_("Installable Options"));
- gtk_window_set_policy(GTK_WINDOW(gpr_inst_options_window), FALSE, FALSE,
- FALSE);
/* a container */
main_vbox = gtk_vbox_new(FALSE, 0);
@@ -1518,7 +1516,7 @@
{
/* dialog widgets */
GtkWidget *constraint_messagebox;
- GtkWidget *constraint_button;
+ /* GtkWidget *constraint_button; */
/* main dialog */
#ifdef USE_GNOME
@@ -1558,6 +1556,11 @@
GTK_MESSAGE_WARNING,//GtkMessageType type,
GTK_BUTTONS_OK,//GtkButtonsType buttons,
message);//const gchar *message_format,...);
+ gtk_signal_connect(GTK_OBJECT(constraint_messagebox), "response",
+ GTK_SIGNAL_FUNC(unref_constraint_messagebox), NULL);
+
+ g_signal_connect_swapped(GTK_OBJECT(constraint_messagebox),"response",
+ G_CALLBACK (gtk_widget_destroy),constraint_messagebox);
#endif
/*A.Mennucc*/
messages_refcount++;
@@ -1566,8 +1569,6 @@
// gtk_object_set_data(GTK_OBJECT(constraint_messagebox),
// "constraint_messagebox", constraint_messagebox);
- gtk_window_set_policy(GTK_WINDOW(constraint_messagebox), FALSE, FALSE,
- FALSE);
return constraint_messagebox;
diff -ur gpr-0.11deb/src/main.c gpr-0.12deb1/src/main.c
--- gpr-0.11deb/src/main.c 2006-07-06 14:10:34.000000000 +0200
+++ gpr-0.12deb1/src/main.c 2007-01-12 17:57:37.000000000 +0100
@@ -101,7 +101,6 @@
if (0==strcmp(argv[0], "lpr")) {
if (getenv("DISPLAY") == NULL) {
char **vars = malloc(sizeof(char *) * (argc + 1));
- int i;
vars[argc] = NULL;
for (i = 0; i < argc; i++)
vars[i] = argv[i];
@@ -143,9 +142,6 @@
NULL,'\0',0,NULL,0,NULL,NULL
}
};
-// return g_strndup(option,sizeof(option)*sizeof(struct poptOption));
-
-
//seems this is useless
gtk_set_locale();
@@ -210,7 +206,7 @@
g_strconcat(g_get_current_dir(), "/",
ppd->file_to_print, NULL);
}
-
+ if(i>1) g_warning("gpr prints only one file at a time (sorry about that)");
}
poptFreeContext(pctx);
}
diff -ur gpr-0.11deb/src/Makefile.in gpr-0.12deb1/src/Makefile.in
--- gpr-0.11deb/src/support.c 2006-04-23 17:06:10.000000000 +0200
+++ gpr-0.12deb1/src/support.c 2007-01-12 17:55:56.000000000 +0100
@@ -48,10 +48,6 @@
#include "support.h"
-/* This is an internally used function to create pixmaps. */
-static GtkWidget *create_dummy_pixmap(GtkWidget * widget,
- gboolean gnome_pixmap);
-
GtkWidget *lookup_widget(GtkWidget * widget, const gchar * widget_name)
{
GtkWidget *parent, *found_widget;
Only in gpr-0.11deb/src: test
Attachment:
signature.asc
Description: OpenPGP digital signature