aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.build.yml1
-rw-r--r--.travis.yml2
-rw-r--r--AUTHORS5
-rw-r--r--ChangeLog47
-rw-r--r--NEWS11
-rw-r--r--configure.ac6
-rw-r--r--data/ayatana-indicator-printers.desktop.in2
-rw-r--r--debian/changelog7
-rw-r--r--src/indicator-printers-menu.c11
9 files changed, 80 insertions, 12 deletions
diff --git a/.build.yml b/.build.yml
index dd79166..69b5920 100644
--- a/.build.yml
+++ b/.build.yml
@@ -102,7 +102,6 @@ variables:
#
build_scripts:
- if [ ${DISTRO_NAME} == "debian" ];then
- - export CFLAGS+=" -Wsign-compare -Wunused-parameter"
- cppcheck --enable=warning,style,performance,portability,information,missingInclude .
- fi
-
diff --git a/.travis.yml b/.travis.yml
index 9556732..73bc55b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
# vim: set ts=2 sts=2 sw=2 expandtab :
-dist: bionic
+dist: focal
language: shell
os: linux
diff --git a/AUTHORS b/AUTHORS
index 6354db7..1866f63 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -11,6 +11,8 @@ Baka Gaijin <lewdwarrior@waifu.club>
Bileto Bot <ci-train-bot@canonical.com>
Charles Kerr <charles.kerr@canonical.com>
CI Train Bot <ci-train-bot@canonical.com>
+David Mohammed <fossfreedom@ubuntu.com>
+David Mohammed <fossfreedom@users.noreply.github.com>
Davit Mayilyan <davit.mayilyan@protonmail.ch>
Didier Roche <didier.roche@canonical.com>
Didier Roche <didrocks@ubuntu.com>
@@ -20,7 +22,6 @@ george k <norhorn@gmail.com>
Heimen Stoffels <vistausss@outlook.com>
Hosted Weblate <hosted@weblate.org>
iNetRoos <inetroos@gmail.com>
-Iván Seoane <ivanrsm1997@gmail.com>
Jeannette L <j.lavoie@net-c.ca>
Jeremy Bicha <jbicha@ubuntu.com>
Joan CiberSheep <cibersheep@gmail.com>
@@ -29,6 +30,7 @@ Kentaro Hayashi <kenhys@gmail.com>
Kristjan Räts <kristjanrats@gmail.com>
Lars Uebernickel <lars.uebernickel@canonical.com>
Louies <louies0623@gmail.com>
+Luca Weiss <luca@z3ntu.xyz>
MarongHappy <daemul72@gmail.com>
Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>
Matteo F. Vescovi <mfvescovi+github@gmail.com>
@@ -40,6 +42,7 @@ Murilo Venturoso <muriloventuroso@gmail.com>
Niara <kitekatkek@gmail.com>
OrionJK - <idorionjk@gmail.com>
Pavel Borecki <pavel.borecki@gmail.com>
+phlostically <phlostically@mailinator.com>
Prachi Joshi <josprachi@yahoo.com>
Quentin PAGÈS <quentinantonin@free.fr>
Reza Almanda <rezaalmanda27@gmail.com>
diff --git a/ChangeLog b/ChangeLog
index 984c59d..e8760b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,51 @@
+2022-02-17 Mike Gabriel
+
+ * release 22.2.0 (HEAD -> main, tag: 22.2.0)
+
+2022-02-08 Mike Gabriel
+
+ * Merge branch 'fossfreedom-main' (0cd3d2c)
+
+2021-12-23 David Mohammed
+
+ * Check if valid cupsoption before processing - closes #12 (6f54901)
+
+2022-02-08 Mike Gabriel
+
+ * Merge branch 'fossfreedom-patch-1' (264f7af)
+
+2021-12-20 David Mohammed
+
+ * Add budgie-desktop support (898307d)
+
+2022-02-08 Robert Tari
+
+ * .travis.yml: Run CI builds on Travis CI's Ubuntu focal base system
+ (0c26e5c)
+
+2021-12-08 Mike Gabriel
+
+ * Merge branch 'z3ntu-bashism' (9ad3ae4)
+
+2021-12-07 Luca Weiss
+
+ * Remove bash-ism from configure.ac (b4e36f4)
+
+2021-11-21 phlostically
+
+ * Translated using Weblate (Esperanto) (5af7477)
+
+2021-11-20 phlostically
+
+ * Translated using Weblate (Esperanto) (193a122)
+
+2021-11-18 phlostically
+
+ * Translated using Weblate (Esperanto) (31e5e29)
+
2021-11-17 Mike Gabriel
- * release 0.9.0 (HEAD -> main, tag: 0.9.0)
+ * release 0.9.0 (5c1756c) (tag: 0.9.0)
2021-10-25 Robert Tari
diff --git a/NEWS b/NEWS
index 8e0de19..f5c790e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+Overview of changes in ayatana-indicator-printers 22.2.0
+
+ - Upstream version bump to new release versioning scheme:
+ <year>.<month>.<revision>, where <year>.<month> will be
+ bumped in Ayatana Indicators bundle releases and <revision>
+ gets incremented with minor changeset releases.
+ - Check if cupsoption is valid before processing.
+ - Add budgie-desktop support.
+ - Remove bash-ism from configure.ac.
+ - Translation updates.
+
Overview of changes in ayatana-indicator-printers 0.9.0
- Add Travis CI configuration.
diff --git a/configure.ac b/configure.ac
index 0986f8c..b47ddb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(ayatana-indicator-printers, 0.9.0)
+AC_INIT(ayatana-indicator-printers, 22.2.0)
AC_PREREQ(2.53)
AM_INIT_AUTOMAKE([])
@@ -50,8 +50,8 @@ if test "x$CUPS_CONFIG" = "xno"; then
AC_MSG_ERROR([could not find cups-config])
fi
AC_CHECK_HEADER(cups/cups.h,,AC_MSG_ERROR([could not find cups.h]))
-CUPS_CFLAGS+=`$CUPS_CONFIG --cflags`
-CUPS_LIBS+=`$CUPS_CONFIG --libs`
+CUPS_CFLAGS=`$CUPS_CONFIG --cflags`
+CUPS_LIBS=`$CUPS_CONFIG --libs`
SERVICE_CFLAGS="$SERVICE_CFLAGS $CUPS_CFLAGS"
SERVICE_LIBS="$SERVICE_LIBS $CUPS_LIBS"
diff --git a/data/ayatana-indicator-printers.desktop.in b/data/ayatana-indicator-printers.desktop.in
index 72e98ec..e0f74b0 100644
--- a/data/ayatana-indicator-printers.desktop.in
+++ b/data/ayatana-indicator-printers.desktop.in
@@ -2,7 +2,7 @@
Type=Application
Name=Ayatana Indicator Printers
Exec=@pkglibexecdir@/ayatana-indicator-printers-service
-OnlyShowIn=MATE;XFCE;
+OnlyShowIn=MATE;XFCE;Budgie
NoDisplay=true
StartupNotify=false
Terminal=false
diff --git a/debian/changelog b/debian/changelog
index a595f5a..93f3508 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ayatana-indicator-printers (22.2.0-0) unstable; urgency=medium
+
+ * Upstream-provided Debian package for ayatana-indicator-printers.
+ See upstream ChangeLog for recent changes.
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 17 Feb 2022 22:26:01 +0100
+
ayatana-indicator-printers (0.9.0-0) unstable; urgency=medium
* Upstream-provided Debian package for ayatana-indicator-printers.
diff --git a/src/indicator-printers-menu.c b/src/indicator-printers-menu.c
index 54ea281..bf0bc07 100644
--- a/src/indicator-printers-menu.c
+++ b/src/indicator-printers-menu.c
@@ -215,10 +215,13 @@ update_all_printer_menuitems (IndicatorPrintersMenu *self)
ndests = cupsGetDests (&dests);
for (i = 0; i < ndests; i++) {
- int state = atoi (cupsGetOption ("printer-state",
- dests[i].num_options,
- dests[i].options));
- update_printer_menuitem (self, dests[i].name, state);
+ const char *option = cupsGetOption ("printer-state",
+ dests[i].num_options,
+ dests[i].options);
+ if (option != NULL) {
+ int state = atoi (option);
+ update_printer_menuitem (self, dests[i].name, state);
+ }
}
cupsFreeDests (ndests, dests);
}