[patch] inkblot-0.99.6-libinklevel-0.6.6.patch

inkblot-0.99.6-libinklevel-0.6.6.patch (text/plain), 19.76 KB, created by Christoph Brill (egore) (RESIGNED) on 2007-01-07 14:15:43 UTC

diff -Naur inkblot-0.99.6.orig/configure.in inkblot-0.99.6/configure.in
--- inkblot-0.99.6.orig/configure.in	2004-09-02 08:34:12.000000000 +0200
+++ inkblot-0.99.6/configure.in	2007-01-07 14:08:37.000000000 +0100
@@ -35,7 +35,7 @@
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GetText Package])
 
 dnl Add the languages which your application supports here.
-ALL_LINGUAS="en_GB"
+ALL_LINGUAS="en_GB de_DE"
 AM_GLIB_GNU_GETTEXT
 
 AC_OUTPUT([
diff -Naur inkblot-0.99.6.orig/po/de_DE.po inkblot-0.99.6/po/de_DE.po
--- inkblot-0.99.6.orig/po/de_DE.po	1970-01-01 01:00:00.000000000 +0100
+++ inkblot-0.99.6/po/de_DE.po	2007-01-07 15:02:37.000000000 +0100
@@ -0,0 +1,195 @@
+# translation of de_DE.po to german
+# German translation of the inkblot.
+# Copyright (C) 2007
+# This file is distributed under the same license as the inkblot package.
+#
+# Christoph Brill <[e-mail]>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: de_DE\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-01-07 14:58+0100\n"
+"PO-Revision-Date: 2007-01-07 15:02+0100\n"
+"Last-Translator: Christoph Brill <[e-mail]>\n"
+"Language-Team: german <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/eggtrayicon.c:118
+msgid "Orientation"
+msgstr "Ausrichtung"
+
+#: src/eggtrayicon.c:119
+msgid "The orientation of the tray."
+msgstr "Ausrichtung im Benachrichtigungsfeld."
+
+#: src/main.c:104
+msgid "Ink level: high"
+msgstr "Tintenfüllstand: hoch"
+
+#: src/main.c:107
+msgid "Ink level: medium"
+msgstr "Tintenfüllstand: mittel"
+
+#: src/main.c:110
+msgid "Ink level: low"
+msgstr "Tintenfüllstand: gering"
+
+#: src/main.c:113
+msgid "Printer off or ink empty"
+msgstr "Drucker ist aus oder Tinte ist alle"
+
+#: src/main.c:116
+msgid "Error: problem with printer"
+msgstr "Fehler: Druckerproblem"
+
+#: src/main.c:304
+msgid ""
+"No supported printers found.\n"
+"\n"
+"Please check your printer and cables and restart Inkblot."
+msgstr ""
+"Keine unterstützten Drucker gefunden\n"
+"\n"
+"Bitte prüfen sie ihren Drucker und ihre Kabel und starten sie anschließend "
+"Inkblot neu."
+
+#: src/main.c:311
+msgid ""
+"No supported printers found.\n"
+"\n"
+"Please check your printer and cables and scan for printers again."
+msgstr ""
+"Keine unterstützten Drucker gefunden\n"
+"\n"
+"Bitte prüfen sie ihren Drucker und ihre Kabel und suchen anschließend erneut "
+"nach Druckern."
+
+#: src/main.c:318
+msgid ""
+"Inkblot was not installed correctly\n"
+"and the inkblot.glade file could not be found."
+msgstr ""
+"Inkblot wurde nicht ordnungsgemäß installiert.\n"
+" Es konnte die Datei inkblot.glade nicht finden."
+
+#: src/main.c:324
+msgid ""
+"Inkblot got an invalid response from the printer.\n"
+"\n"
+"Please check your printer and check the libinklevel homepage if your printer "
+"is supported."
+msgstr ""
+"Inkblot erhielt eine ungültige Anwort vom Drucker.\n"
+"\n"
+"Bitte prüfen sie ihren Drucker und überprüfen sie auf der Internetseite von "
+"libinklevel ob ihr Drucker unterstützt wird."
+
+#: src/main.c:332
+msgid "An unexpected error occurred."
+msgstr "Ein unerwarteter Fehler ist aufgetreten."
+
+#: src/main.c:339
+msgid "Inkblot Error"
+msgstr "Inkblot Fehler"
+
+#: src/detect.c:72
+msgid "Choose Printer Not Implemented"
+msgstr "Drucker wählen ist nocht nicht implementiert."
+
+#: src/detect.c:81
+msgid "parallel port"
+msgstr "Paralleler Port"
+
+#: src/detect.c:83
+msgid "USB"
+msgstr "USB"
+
+#: src/detect.c:86
+#, c-format
+msgid ""
+"Found <i>%s</i> %s printer on %s\n"
+"\n"
+"Inkblot will report the ink level on this device."
+msgstr ""
+"Drucker <i>%s</i> %s wurde an %s gefunden.\n"
+"\n"
+"Inkblot wird den Tintenfüllstand für diesen Drucker melden."
+
+#: src/detect.c:96
+msgid "Printer Detection Complete"
+msgstr "Druckersuche abgeschlossen"
+
+#: src/detect.c:99
+msgid "Inkblot Setup"
+msgstr "Inkblot einrichten"
+
+#: src/menu.c:46
+msgid "Reports on your printer ink levels.\n"
+msgstr "Prüft den Tintenfüllstand ihres Druckers.\n"
+
+#: src/menu.c:70
+msgid "Rescan Printer Devices"
+msgstr "Druckersuche durchführen"
+
+#: src/menu.c:79
+msgid "About Inkblot"
+msgstr "Über Inkblot"
+
+#: src/menu.c:87
+msgid "Exit Inkblot"
+msgstr "Inkblot beenden"
+
+#: inkblot.schemas.in.h:1
+msgid "1 = Parallel Port, 2 = USB"
+msgstr "1 = Paralleler Port, 2 = USB"
+
+#: inkblot.schemas.in.h:2
+msgid ""
+"If this key is set, inkblot will try to find new devices and will set up the "
+"other keys."
+msgstr ""
+"Wenn dieser Schlüssel gesetzt ist, versucht inkblot neue Geräte zu finden "
+"und wird andere Schlüssel setzen."
+
+#: inkblot.schemas.in.h:3
+msgid "libinklevel bus type"
+msgstr "libinklevel Bus-Typ"
+
+#: inkblot.schemas.in.h:4
+msgid "libinklevel config indicator"
+msgstr "libinklevel Konfigurationsindikator"
+
+#: inkblot.schemas.in.h:5
+msgid "libinklevel port number"
+msgstr "libinklevel Portnummer"
+
+#: inkblot.schemas.in.h:6
+msgid "the number of the lp port - ie. 0 = lp0"
+msgstr "Die Nummer des Druckersports - z.B. 0 = lp0"
+
+#: inkblot.desktop.in.h:1
+msgid "Check your printer ink cartridge levels"
+msgstr "Prüft den Füllstand ihrer Druckertinte"
+
+#: inkblot.desktop.in.h:2
+msgid "Inkblot"
+msgstr "Inkblot"
+
+#: inkblot.desktop.in.h:3
+msgid "Printer Ink Level Monitor"
+msgstr "Tintenfüllstands-Monitor"
+
+#: glade/inkblot.glade.h:2
+#, no-c-format
+msgid "10%"
+msgstr "10%"
+
+#: glade/inkblot.glade.h:3
+msgid "Colour Details"
+msgstr "Farbdetails"
+
+#: glade/inkblot.glade.h:4
+msgid "Inkblot Printer Monitor"
+msgstr "Inkblot Druckermonitor"
diff -Naur inkblot-0.99.6.orig/po/en_GB.po inkblot-0.99.6/po/en_GB.po
--- inkblot-0.99.6.orig/po/en_GB.po	2004-07-04 15:50:40.000000000 +0200
+++ inkblot-0.99.6/po/en_GB.po	2007-01-07 15:04:41.000000000 +0100
@@ -1,20 +1,22 @@
-# 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.
+# translation of en_GB.po to german
+# English translation of the inkblot.
+# Copyright (C) 2004-2007
+# This file is distributed under the same license as the inkblot package.
 #
-#, fuzzy
+# Mike Newman <[e-mail]>, 2004.
+# Christoph Brill <[e-mail]>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: 0.99.4\n"
+"Project-Id-Version: en_GB\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-04 14:50+0100\n"
-"PO-Revision-Date: 2004-07-03 09:16+0100\n"
-"Last-Translator: Mike Newman <[e-mail]>\n"
-"Language-Team: English <[e-mail]>\n"
+"POT-Creation-Date: 2007-01-07 14:58+0100\n"
+"PO-Revision-Date: 2007-01-07 15:04+0100\n"
+"Last-Translator: Christoph Brill <[e-mail]>\n"
+"Language-Team: german <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #: src/eggtrayicon.c:118
 msgid "Orientation"
@@ -26,100 +28,118 @@
 
 #: src/main.c:104
 msgid "Ink level: high"
-msgstr ""
+msgstr "Ink level: high"
 
 #: src/main.c:107
 msgid "Ink level: medium"
-msgstr ""
+msgstr "Ink level: medium"
 
 #: src/main.c:110
 msgid "Ink level: low"
-msgstr ""
+msgstr "Ink level: low"
 
 #: src/main.c:113
 msgid "Printer off or ink empty"
-msgstr ""
+msgstr "Printer off or ink empty"
 
 #: src/main.c:116
 msgid "Error: problem with printer"
-msgstr ""
+msgstr "Error: problem with printer"
 
-#: src/main.c:300
+#: src/main.c:304
 msgid ""
 "No supported printers found.\n"
 "\n"
 "Please check your printer and cables and restart Inkblot."
 msgstr ""
+"No supported printers found.\n"
+"\n"
+"Please check your printer and cables and restart Inkblot."
 
-#: src/main.c:307
+#: src/main.c:311
 msgid ""
 "No supported printers found.\n"
 "\n"
 "Please check your printer and cables and scan for printers again."
 msgstr ""
+"No supported printers found.\n"
+"\n"
+"Please check your printer and cables and scan for printers again."
 
-#: src/main.c:314
+#: src/main.c:318
 msgid ""
 "Inkblot was not installed correctly\n"
 "and the inkblot.glade file could not be found."
 msgstr ""
+"Inkblot was not installed correctly\n"
+"and the inkblot.glade file could not be found."
 
-#: src/main.c:320
-msgid "An unexpected error occurred."
+#: src/main.c:324
+msgid ""
+"Inkblot got an invalid response from the printer.\n"
+"\n"
+"Please check your printer and check the libinklevel homepage if your printer "
+"is supported."
 msgstr ""
+"Inkblot got an invalid response from the printer.\n"
+"\n"
+"Please check your printer and check the libinklevel homepage if your printer "
+"is supported."
 
-#: src/main.c:327
-#, fuzzy
+#: src/main.c:332
+msgid "An unexpected error occurred."
+msgstr "An unexpected error occurred."
+
+#: src/main.c:339
 msgid "Inkblot Error"
-msgstr "Inkblot"
+msgstr "Inkblot Error"
 
-#: src/detect.c:71
+#: src/detect.c:72
 msgid "Choose Printer Not Implemented"
-msgstr ""
+msgstr "Choose Printer Not Implemented"
 
-#: src/detect.c:80
+#: src/detect.c:81
 msgid "parallel port"
-msgstr ""
+msgstr "parallel port"
 
-#: src/detect.c:82
+#: src/detect.c:83
 msgid "USB"
-msgstr ""
+msgstr "USB"
 
-#: src/detect.c:85
+#: src/detect.c:86
 #, c-format
 msgid ""
 "Found <i>%s</i> %s printer on %s\n"
 "\n"
 "Inkblot will report the ink level on this device."
 msgstr ""
+"Found <i>%s</i> %s printer on %s\n"
+"\n"
+"Inkblot will report the ink level on this device."
 
-#: src/detect.c:95
+#: src/detect.c:96
 msgid "Printer Detection Complete"
-msgstr ""
+msgstr "Printer Detection Complete"
 
-#: src/detect.c:98
-#, fuzzy
+#: src/detect.c:99
 msgid "Inkblot Setup"
-msgstr "Inkblot"
+msgstr "Inkblot Setup"
 
 #: src/menu.c:46
-#, fuzzy
 msgid "Reports on your printer ink levels.\n"
-msgstr "Check your printer ink cartridge levels"
+msgstr "Check your printer ink cartridge levels\n"
 
 #: src/menu.c:70
 msgid "Rescan Printer Devices"
-msgstr ""
+msgstr "Rescan Printer Devices"
 
 #: src/menu.c:79
-#, fuzzy
 msgid "About Inkblot"
-msgstr "Inkblot"
+msgstr "About Inkblot"
 
 #: src/menu.c:87
-#, fuzzy
 msgid "Exit Inkblot"
-msgstr "Inkblot"
+msgstr "Exit Inkblot"
 
 #: inkblot.schemas.in.h:1
 msgid "1 = Parallel Port, 2 = USB"
@@ -160,3 +180,16 @@
 #: inkblot.desktop.in.h:3
 msgid "Printer Ink Level Monitor"
 msgstr "Printer Ink Level Monitor"
+
+#: glade/inkblot.glade.h:2
+#, no-c-format
+msgid "10%"
+msgstr "10%"
+
+#: glade/inkblot.glade.h:3
+msgid "Colour Details"
+msgstr "Color Details"
+
+#: glade/inkblot.glade.h:4
+msgid "Inkblot Printer Monitor"
+msgstr "Inkblot Printer Monitor"
diff -Naur inkblot-0.99.6.orig/po/inkblot.pot inkblot-0.99.6/po/inkblot.pot
--- inkblot-0.99.6.orig/po/inkblot.pot	2004-07-04 15:50:24.000000000 +0200
+++ inkblot-0.99.6/po/inkblot.pot	2007-01-07 14:58:56.000000000 +0100
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-04 14:50+0100\n"
+"POT-Creation-Date: 2007-01-07 14:58+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -44,47 +44,55 @@
 msgid "Error: problem with printer"
 msgstr ""
 
-#: src/main.c:300
+#: src/main.c:304
 msgid ""
 "No supported printers found.\n"
 "\n"
 "Please check your printer and cables and restart Inkblot."
 msgstr ""
 
-#: src/main.c:307
+#: src/main.c:311
 msgid ""
 "No supported printers found.\n"
 "\n"
 "Please check your printer and cables and scan for printers again."
 msgstr ""
 
-#: src/main.c:314
+#: src/main.c:318
 msgid ""
 "Inkblot was not installed correctly\n"
 "and the inkblot.glade file could not be found."
 msgstr ""
 
-#: src/main.c:320
+#: src/main.c:324
+msgid ""
+"Inkblot got an invalid response from the printer.\n"
+"\n"
+"Please check your printer and check the libinklevel homepage if your printer "
+"is supported."
+msgstr ""
+
+#: src/main.c:332
 msgid "An unexpected error occurred."
 msgstr ""
 
-#: src/main.c:327
+#: src/main.c:339
 msgid "Inkblot Error"
 msgstr ""
 
-#: src/detect.c:71
+#: src/detect.c:72
 msgid "Choose Printer Not Implemented"
 msgstr ""
 
-#: src/detect.c:80
+#: src/detect.c:81
 msgid "parallel port"
 msgstr ""
 
-#: src/detect.c:82
+#: src/detect.c:83
 msgid "USB"
 msgstr ""
 
-#: src/detect.c:85
+#: src/detect.c:86
 #, c-format
 msgid ""
 "Found <i>%s</i> %s printer on %s\n"
@@ -92,11 +100,11 @@
 "Inkblot will report the ink level on this device."
 msgstr ""
 
-#: src/detect.c:95
+#: src/detect.c:96
 msgid "Printer Detection Complete"
 msgstr ""
 
-#: src/detect.c:98
+#: src/detect.c:99
 msgid "Inkblot Setup"
 msgstr ""
 
@@ -153,3 +161,16 @@
 #: inkblot.desktop.in.h:3
 msgid "Printer Ink Level Monitor"
 msgstr ""
+
+#: glade/inkblot.glade.h:2
+#, no-c-format
+msgid "10%"
+msgstr ""
+
+#: glade/inkblot.glade.h:3
+msgid "Colour Details"
+msgstr ""
+
+#: glade/inkblot.glade.h:4
+msgid "Inkblot Printer Monitor"
+msgstr ""
diff -Naur inkblot-0.99.6.orig/po/missing inkblot-0.99.6/po/missing
--- inkblot-0.99.6.orig/po/missing	1970-01-01 01:00:00.000000000 +0100
+++ inkblot-0.99.6/po/missing	2007-01-07 14:57:48.000000000 +0100
@@ -0,0 +1,3 @@
+glade/inkblot.glade
+inkblot.desktop.in.h
+inkblot.schemas.in.h
diff -Naur inkblot-0.99.6.orig/po/POTFILES.in inkblot-0.99.6/po/POTFILES.in
--- inkblot-0.99.6.orig/po/POTFILES.in	2004-07-04 15:49:12.000000000 +0200
+++ inkblot-0.99.6/po/POTFILES.in	2007-01-07 14:58:45.000000000 +0100
@@ -1,8 +1,11 @@
-./src/eggtrayicon.h
-./src/eggtrayicon.c
-./src/main.c
-./src/detect.c
-./src/menu.c
-./src/inkblot.h
-./inkblot.schemas.in
-./inkblot.desktop.in
+src/eggtrayicon.h
+src/eggtrayicon.c
+src/main.c
+src/detect.c
+src/menu.c
+src/inkblot.h
+inkblot.schemas.in
+inkblot.desktop.in
+glade/inkblot.glade
+inkblot.desktop.in.h
+inkblot.schemas.in.h
diff -Naur inkblot-0.99.6.orig/src/detect.c inkblot-0.99.6/src/detect.c
--- inkblot-0.99.6.orig/src/detect.c	2004-07-04 15:35:54.000000000 +0200
+++ inkblot-0.99.6/src/detect.c	2007-01-07 14:20:05.000000000 +0100
@@ -44,14 +44,15 @@
 	for (bus=0; bus <3; bus++) {
 		for (port=0; port<17; port++) {
 			result = get_ink_level (bus, port, &device);
-			if (result == 0) {
+			if (result == OK) {
 				InkblotPrinter *dev = g_new0(InkblotPrinter,1);
 				dev->model = g_strdup(device.model);
 				dev->bus = bus;
 				dev->port = port;
-				dev->type = device.type;
 				printers = g_list_prepend (printers, dev);
 				num_printers++;
+			} else {
+				printf("Result was %d\n", result);
 			}
 		}
 	}
diff -Naur inkblot-0.99.6.orig/src/inkblot.h inkblot-0.99.6/src/inkblot.h
--- inkblot-0.99.6.orig/src/inkblot.h	2004-07-04 15:36:18.000000000 +0200
+++ inkblot-0.99.6/src/inkblot.h	2007-01-07 13:45:47.000000000 +0100
@@ -36,6 +36,7 @@
 	INKBLOT_ERROR_GLADE,
 	INKBLOT_ERROR_NO_CONFIG,
 	INKBLOT_ERROR_NO_PRINTER,
+	INKBLOT_ERROR_INVALID_RESPONSE,
 	INKBLOT_ERROR_UNKNOWN
 } InkblotError;
 
@@ -52,7 +53,6 @@
 	gchar *model;
 	gint bus;
 	gint port;
-	gint type;
 } InkblotPrinter;
 
 /* Inkblot - Function Definitions */
diff -Naur inkblot-0.99.6.orig/src/main.c inkblot-0.99.6/src/main.c
--- inkblot-0.99.6.orig/src/main.c	2004-07-04 15:37:51.000000000 +0200
+++ inkblot-0.99.6/src/main.c	2007-01-07 14:48:10.000000000 +0100
@@ -211,28 +211,32 @@
 	mg_prog = glade_xml_get_widget (glade,"mg_prog");
 	yl_prog = glade_xml_get_widget (glade,"yl_prog");
         get_ink_level (pref_bus, pref_port, &level);
+	if (level.status != RESPONSE_VALID) {
+		inkblot_error_dialog ( INKBLOT_ERROR_INVALID_RESPONSE );
+		exit(1);
+	}
 	/* if no colour level reported, but individual reservoirs
-         * available, report an average */
-        if (level.color == 0 && (level.cyan || level.magenta || level.yellow)) {
-                level.color = ( level.cyan + level.magenta + level.yellow ) / 3;
+         * available, report an average (emulates cartridge with 3 inks) */
+        if (level.levels[CARTRIDGE_COLOR][INDEX_LEVEL] == 0 && (level.levels[CARTRIDGE_CYAN][INDEX_LEVEL] || level.levels[CARTRIDGE_MAGENTA][INDEX_LEVEL] || level.levels[CARTRIDGE_YELLOW][INDEX_LEVEL])) {
+                level.levels[CARTRIDGE_COLOR][INDEX_LEVEL] = ( level.levels[CARTRIDGE_CYAN][INDEX_LEVEL] + level.levels[CARTRIDGE_MAGENTA][INDEX_LEVEL] + level.levels[CARTRIDGE_YELLOW][INDEX_LEVEL] ) / 3;
         }
-	black = g_strdup_printf("%d%%",level.black);
-        color = g_strdup_printf("%d%%",level.color);
-	cyan = g_strdup_printf("%d%%",level.cyan);
-	magenta = g_strdup_printf("%d%%",level.magenta);
-	yellow = g_strdup_printf("%d%%",level.yellow);
+	black = g_strdup_printf("%d%%",level.levels[CARTRIDGE_BLACK][INDEX_LEVEL]);
+        color = g_strdup_printf("%d%%",level.levels[CARTRIDGE_COLOR][INDEX_LEVEL]);
+	cyan = g_strdup_printf("%d%%",level.levels[CARTRIDGE_CYAN][INDEX_LEVEL]);
+	magenta = g_strdup_printf("%d%%",level.levels[CARTRIDGE_MAGENTA][INDEX_LEVEL]);
+	yellow = g_strdup_printf("%d%%",level.levels[CARTRIDGE_YELLOW][INDEX_LEVEL]);
         gtk_label_set_text(GTK_LABEL(b_label),black);
         gtk_label_set_text(GTK_LABEL(c_label),color);
 	gtk_label_set_text(GTK_LABEL(cy_label),cyan);
 	gtk_label_set_text(GTK_LABEL(mg_label),magenta);
 	gtk_label_set_text(GTK_LABEL(yl_label),yellow);
-        gtk_progress_set_value(GTK_PROGRESS(b_prog),level.black);
-        gtk_progress_set_value(GTK_PROGRESS(c_prog),level.color);
-	gtk_progress_set_value(GTK_PROGRESS(cy_prog),level.cyan);
-	gtk_progress_set_value(GTK_PROGRESS(mg_prog),level.magenta);
-	gtk_progress_set_value(GTK_PROGRESS(yl_prog),level.yellow);
+        gtk_progress_set_value(GTK_PROGRESS(b_prog),level.levels[CARTRIDGE_BLACK][INDEX_LEVEL]);
+        gtk_progress_set_value(GTK_PROGRESS(c_prog),level.levels[CARTRIDGE_COLOR][INDEX_LEVEL]);
+	gtk_progress_set_value(GTK_PROGRESS(cy_prog),level.levels[CARTRIDGE_CYAN][INDEX_LEVEL]);
+	gtk_progress_set_value(GTK_PROGRESS(mg_prog),level.levels[CARTRIDGE_MAGENTA][INDEX_LEVEL]);
+	gtk_progress_set_value(GTK_PROGRESS(yl_prog),level.levels[CARTRIDGE_YELLOW][INDEX_LEVEL]);
 	gtk_window_set_title(GTK_WINDOW(dialog),level.model);
-	if (level.cyan || level.magenta || level.yellow) {
+	if (level.levels[CARTRIDGE_CYAN][INDEX_LEVEL] || level.levels[CARTRIDGE_MAGENTA][INDEX_LEVEL] || level.levels[CARTRIDGE_YELLOW][INDEX_LEVEL]) {
 		gtk_widget_set_sensitive(expander,TRUE);
 	} else {
 		gtk_widget_set_sensitive(expander,FALSE);
@@ -258,13 +262,13 @@
 	gint result;
 	result = get_ink_level (pref_bus, pref_port, &level);
 	if (result < 0) return INKBLOT_ERROR;
-	color = level.color;
+	color = level.levels[CARTRIDGE_COLOR][INDEX_LEVEL];
 	/* if no colour level reported, but individual reservoirs
 	 * available, report an average */
-	if (color == 0 && (level.cyan || level.magenta || level.yellow)) {
-		color = ( level.cyan + level.magenta + level.yellow ) / 3;
+	if (color == 0 && (level.levels[CARTRIDGE_CYAN][INDEX_LEVEL] || level.levels[CARTRIDGE_MAGENTA][INDEX_LEVEL] || level.levels[CARTRIDGE_YELLOW][INDEX_LEVEL])) {
+		color = ( level.levels[CARTRIDGE_CYAN][INDEX_LEVEL] + level.levels[CARTRIDGE_MAGENTA][INDEX_LEVEL] + level.levels[CARTRIDGE_YELLOW][INDEX_LEVEL] ) / 3;
 	}
-	black = level.black;
+	black = level.levels[CARTRIDGE_BLACK][INDEX_LEVEL];
 	total = color+black/2;
 	if (total>66) return INKBLOT_OK;
 	if (total>33) return INKBLOT_WARN;
@@ -310,12 +314,20 @@
                 buttons = GTK_BUTTONS_CLOSE;
                 type = GTK_MESSAGE_WARNING;
                 break;
-	  case INKBLOT_ERROR_GLADE:
+	case INKBLOT_ERROR_GLADE:
 		message = g_strdup (_("Inkblot was not installed correctly\n"
 				      "and the inkblot.glade file could not "
 				      "be found."));
 		type = GTK_MESSAGE_ERROR;
 		buttons = GTK_BUTTONS_CLOSE;
+	case INKBLOT_ERROR_INVALID_RESPONSE:
+		message = g_strdup (_("Inkblot got an invalid response from "
+		                      "the printer.\n\n"
+		                      "Please check your printer and check the "
+				      "libinklevel homepage if your printer is "
+				      "supported."));
+		type = GTK_MESSAGE_ERROR;
+		buttons = GTK_BUTTONS_CLOSE;
 	  default:
 		message = g_strdup (_("An unexpected error occurred."));
                 buttons = GTK_BUTTONS_CLOSE;