Hello community, here is the log from the commit of package pk-update-icon for openSUSE:Factory checked in at 2014-02-08 10:34:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pk-update-icon (Old) and /work/SRC/openSUSE:Factory/.pk-update-icon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pk-update-icon" Changes: -------- --- /work/SRC/openSUSE:Factory/pk-update-icon/pk-update-icon.changes 2013-10-17 17:45:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pk-update-icon.new/pk-update-icon.changes 2014-02-08 10:34:35.000000000 +0100 @@ -1,0 +2,11 @@ +Fri Feb 7 21:01:00 UTC 2014 - [email protected] + +- update to version 1 + - Add missing function prototypes + - Stylistic fixes + - Add README file with build instructions and author information + - Convert the manpage to DocBook V5.0 + - Use pax to generate tarballs + - Fix automatic dependency generation and improve portability + +------------------------------------------------------------------- Old: ---- pk-update-icon-0.2.2.tar.gz New: ---- pk-update-icon-1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pk-update-icon.spec ++++++ --- /var/tmp/diff_new_pack.jT8yUr/_old 2014-02-08 10:34:36.000000000 +0100 +++ /var/tmp/diff_new_pack.jT8yUr/_new 2014-02-08 10:34:36.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package pk-update-icon # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,21 +17,22 @@ Name: pk-update-icon -Version: 0.2.2 +Version: 1 Release: 0 Summary: Software Update Notifier based on PackageKit License: GPL-2.0+ Group: System/Daemons Url: https://hg.guido-berhoerster.org/projects/pk-update-icon/ Source: %{name}-%{version}.tar.gz +BuildRequires: docbook5-xsl-stylesheets +BuildRequires: docbook_5 BuildRequires: intltool +BuildRequires: libxslt-tools +BuildRequires: update-desktop-files BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(packagekit-glib2) BuildRequires: pkgconfig(unique-1.0) -%if 0%{?suse_version} -BuildRequires: update-desktop-files -%endif Recommends: %{name}-lang # activating the tray icon executes gpk-update-viewer Requires: gnome-packagekit @@ -46,13 +47,16 @@ %setup -q %build -make %{?_smp_mflags} prefix=%{_prefix} CFLAGS="%{optflags}" +make %{?_smp_mflags} \ + prefix=%{_prefix} \ +%if 0%{?suse_version} == 1230 + DOCBOOK5_MANPAGES_STYLESHEET='/usr/share/xml/docbook/stylesheet/nwalsh5/1.77.1/manpages/docbook.xsl' \ +%endif + CFLAGS="%{optflags}" %install %make_install prefix=%{_prefix} -%if 0%{?suse_version} %suse_update_desktop_file %{name} -%endif %find_lang %{name} %{?no_lang_C} @@ -61,7 +65,7 @@ %files %defattr(-,root,root) -%doc AUTHORS COPYING +%doc README COPYING %{_bindir}/%{name} %{_mandir}/man1/%{name}.1* %{_sysconfdir}/xdg/autostart/%{name}.desktop ++++++ pk-update-icon-0.2.2.tar.gz -> pk-update-icon-1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pk-update-icon-0.2.2/AUTHORS new/pk-update-icon-1/AUTHORS --- old/pk-update-icon-0.2.2/AUTHORS 2012-07-18 11:56:59.000000000 +0200 +++ new/pk-update-icon-1/AUTHORS 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -Pavol Rusnak <[email protected]> -Guido Berhoerster <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pk-update-icon-0.2.2/Makefile new/pk-update-icon-1/Makefile --- old/pk-update-icon-0.2.2/Makefile 2012-07-18 11:57:26.000000000 +0200 +++ new/pk-update-icon-1/Makefile 2014-02-07 21:58:22.000000000 +0100 @@ -1,12 +1,60 @@ +# +# Copyright (C) 2014 Guido Berhoerster <[email protected]> +# +# Licensed under the GNU General Public License Version 2 +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# + +PACKAGE = pk-update-icon +APP_NAME = org.opensuse.pk-update-icon +VERSION = 1 +DISTNAME := $(PACKAGE)-$(VERSION) + +# gcc, clang, icc +MAKEDEPEND.c = $(CC) -MM $(CFLAGS) $(CPPFLAGS) +# Sun/Solaris Studio +#MAKEDEPEND.c = $(CC) -xM1 $(CFLAGS) $(CPPFLAGS) +# X makedepend +#MAKEDEPEND.c = makedepend -f- -Y -- $(CFLAGS) $(CPPFLAGS) -- INSTALL := install INSTALL.exec := $(INSTALL) -D -m 0755 INSTALL.data := $(INSTALL) -D -m 0644 -TAR := tar +PAX := pax GZIP := gzip SED := sed MSGFMT := msgfmt INTLTOOL_UPDATE := intltool-update INTLTOOL_MERGE := intltool-merge +XSLTPROC := xsltproc +DOCBOOK5_MANPAGES_STYLESHEET = http://docbook.sourceforge.net/release/xsl-ns/current/manpages/docbook.xsl + +define generate-manpage-rule = +%.$(1): %.$(1).xml + $$(XSLTPROC) \ + --xinclude \ + --stringparam package $$(PACKAGE) \ + --stringparam version $$(VERSION)\ + docbook-update-source-data.xsl $$< | \ + $$(XSLTPROC) \ + --xinclude \ + $$(DOCBOOK5_MANPAGES_FLAGS) \ + --output $$@ \ + $$(DOCBOOK5_MANPAGES_STYLESHEET) \ + - +endef DESTDIR ?= prefix ?= /usr/local @@ -17,11 +65,8 @@ sysconfdir ?= /etc xdgautostartdir ?= $(sysconfdir)/xdg/autostart -PACKAGE = pk-update-icon -APP_NAME = org.opensuse.pk-update-icon -VERSION = 0.2.2 -DISTNAME := $(PACKAGE)-$(VERSION) OBJS = main.o pkui-icon.o pkui-backend.o +MANPAGES = $(PACKAGE).1 AUTOSTART_FILE = $(PACKAGE).desktop MOFILES := $(patsubst %.po,%.mo,$(wildcard po/*.po)) POTFILE = po/$(PACKAGE).pot @@ -32,12 +77,14 @@ -DVERSION=\"$(VERSION)\" \ -DLOCALEDIR="\"$(localedir)\"" LDLIBS := $(shell pkg-config --libs gtk+-2.0 unique-1.0 libnotify packagekit-glib2) +DOCBOOK5_MANPAGES_FLAGS = --stringparam man.authors.section.enabled 0 \ + --stringparam man.copyright.section.enabled 0 .DEFAULT_TARGET = all .PHONY: all clean clobber dist install -all: $(PACKAGE) $(MOFILES) $(AUTOSTART_FILE) +all: $(PACKAGE) $(MANPAGES) $(MOFILES) $(AUTOSTART_FILE) $(PACKAGE): $(OBJS) $(LINK.o) $^ $(LDLIBS) -o $@ @@ -54,11 +101,10 @@ done %.o: %.c - $(COMPILE.c) -MD -o $@ $< - @cp $*.d $*.P; \ - $(SED) -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $*.P; \ - rm -f $*.d + $(MAKEDEPEND.c) $< | $(SED) -f deps.sed >$*.d + $(COMPILE.c) -o $@ $< + +$(foreach section,1 2 3 4 5 6 7 8 9,$(eval $(call generate-manpage-rule,$(section)))) %.desktop: %.desktop.in $(MOFILES) $(INTLTOOL_MERGE) --desktop-style --utf8 po $< $@ @@ -78,14 +124,13 @@ $(DESTDIR)$(mandir)/man1/$(PACKAGE).1 clean: - rm -f $(PACKAGE) $(OBJS) $(POTFILE) $(MOFILES) $(AUTOSTART_FILE) + rm -f $(PACKAGE) $(OBJS) $(POTFILE) $(MOFILES) $(MANPAGES) $(AUTOSTART_FILE) clobber: clean - rm -f *.P + rm -f $(patsubst %.o,%.d,$(OBJS)) dist: clobber - rm -f $(DISTNAME) - ln -s -f . $(DISTNAME) - $(TAR) cv $(DISTNAME)/* | $(GZIP) > $(DISTNAME).tar.gz + $(PAX) -w -x ustar -s ',.*/\..*,,' -s ',./[^/]*\.tar\.gz,,' \ + -s ',\./,$(DISTNAME)/,' . | $(GZIP) > $(DISTNAME).tar.gz --include $(patsubst %.o,%.P,$(OBJS)) +-include $(patsubst %.o,%.d,$(OBJS)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pk-update-icon-0.2.2/README new/pk-update-icon-1/README --- old/pk-update-icon-0.2.2/README 1970-01-01 01:00:00.000000000 +0100 +++ new/pk-update-icon-1/README 2014-02-07 18:30:00.000000000 +0100 @@ -0,0 +1,50 @@ +pk-update-icon +============== + +Description +----------- + +pk-update-icon displays notifications and an icon in the tray area of the panel +when package updates are available. + +Build Instructions +------------------ + +pk-update-icon requires GNU make, GNU gettext, GNU or BSD install, the +xsltproc tool from libxml2 and the following shared libraries to be installed: + +- GLib version 2.30 or later +- GTK+ version 2.24 or later +- libunique +- libnotify +- PackageKit-glib2 + +Authors +------- + +pk-update-icon was initially created by Pavol Rusnak and later rewritten by +Guido Berhoerster. + +License +------- + +Except otherwise noted, all files are Copyright (C) 2014 Guido Berhoerster and +distributed under the following license terms: + +Copyright (C) 2014 Guido Berhoerster <[email protected]> + +Licensed under the GNU General Public License Version 2 + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pk-update-icon-0.2.2/deps.sed new/pk-update-icon-1/deps.sed --- old/pk-update-icon-0.2.2/deps.sed 1970-01-01 01:00:00.000000000 +0100 +++ new/pk-update-icon-1/deps.sed 2014-02-07 17:54:45.000000000 +0100 @@ -0,0 +1,26 @@ +/^[^:]\{1,\}:.*\\$/{ + h + s/\([^:]\{1,\}:\).*/\1/ + x + s/[^:]\{1,\}:// +} +/\\$/,/^$/bgen +/\\$/,/[^\\]$/{ +:gen + s/[[:blank:]]*\\$// + s/^[[:blank:]]*// + G + s/\(.*\)\n\(.*\)/\2 \1/ +} +/^[^:]\{1,\}:[[:blank:]]*$/d +/^[^:]\{1,\}\.o:/{ + s/[[:blank:]]*[^[:blank:]]\{1,\}\.[cC][[:blank:]]*/ /g + s/[[:blank:]]*[^[:blank:]]\{1,\}\.[cC]$//g + s/[[:blank:]]*[^[:blank:]]\{1,\}\.cc[[:blank:]]*/ /g + s/[[:blank:]]*[^[:blank:]]\{1,\}\.cc$//g + s/[[:blank:]]*[^[:blank:]]\{1,\}\.cpp[[:blank:]]*/ /g + s/[[:blank:]]*[^[:blank:]]\{1,\}\.cpp$//g + /^[^:]\{1,\}:[[:blank:]]*$/d + s/^\([^:]\{1,\}\)\.o[[:blank:]]*:[[:blank:]]*\(.*\)/\1.d: $(wildcard \2)\ +&/ +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pk-update-icon-0.2.2/docbook-update-source-data.xsl new/pk-update-icon-1/docbook-update-source-data.xsl --- old/pk-update-icon-0.2.2/docbook-update-source-data.xsl 1970-01-01 01:00:00.000000000 +0100 +++ new/pk-update-icon-1/docbook-update-source-data.xsl 2014-02-07 18:10:41.000000000 +0100 @@ -0,0 +1,29 @@ +<?xml version="1.0"?> +<xsl:stylesheet + version="1.0" + xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; + xmlns:db="http://docbook.org/ns/docbook"; + xmlns="http://docbook.org/ns/docbook"; + exclude-result-prefixes="xsl db"> + + <xsl:param name="package" select="''" /> + <xsl:param name="version" select="''" /> + + <xsl:template match="db:refmeta/db:refmiscinfo[@class = 'source' or + @class = 'version']"/> + + <xsl:template match="db:refmeta"> + <xsl:copy> + <xsl:apply-templates/> + <refmiscinfo class="source"><xsl:value-of select="$package"/></refmiscinfo> + <refmiscinfo class="version"><xsl:value-of select="$version"/></refmiscinfo> + </xsl:copy> + </xsl:template> + + <xsl:template match="@*|node()"> + <xsl:copy> + <xsl:apply-templates select="@*|node()"/> + </xsl:copy> + </xsl:template> + +</xsl:stylesheet> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pk-update-icon-0.2.2/pk-update-icon-0.2.2 new/pk-update-icon-1/pk-update-icon-0.2.2 --- old/pk-update-icon-0.2.2/pk-update-icon-0.2.2 2014-02-08 10:34:36.000000000 +0100 +++ new/pk-update-icon-1/pk-update-icon-0.2.2 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pk-update-icon-0.2.2/pk-update-icon.1 new/pk-update-icon-1/pk-update-icon.1 --- old/pk-update-icon-0.2.2/pk-update-icon.1 2012-07-18 11:56:59.000000000 +0200 +++ new/pk-update-icon-1/pk-update-icon.1 1970-01-01 01:00:00.000000000 +0100 @@ -1,50 +0,0 @@ -.\" Copyright (C) 2011 Guido Berhoerster <[email protected]> -.\" -.\" Licensed under the GNU General Public License Version 2 -.\" -.\" This program is free software; you can redistribute it and/or modify -.\" it under the terms of the GNU General Public License as published by -.\" the Free Software Foundation; either version 2 of the License, or -.\" (at your option) any later version. -.\" -.\" This program is distributed in the hope that it will be useful, -.\" but WITHOUT ANY WARRANTY; without even the implied warranty of -.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -.\" GNU General Public License for more details. -.\" -.\" You should have received a copy of the GNU General Public License -.\" along with this program; if not, write to the Free Software -.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -.\" -.TH PK\-UPDATE\-ICON 1 "20 Oct 2011" -.SH NAME -pk\-update\-icon \- display notifications about software updates -.SH SYNOPSIS -\fBpk\-update\-icon\fR -[\fB\-hv?\fR] -[\fB\-d\fR \fIdelay\fR | \fB\-\-delay\fR=\fIdelay\fR] -[\fB\-i\fR \fIinterval\fR | \fB\-\-interval\fR=\fIinterval\fR] -.SH DESCRIPTION -\fBpk\-update\-icon\fR displays notifications and an icon in the tray area of -the panel when package updates are available. -.SH OPTIONS -The following options are supported: -.TP -.BR \-d ", " \-\-delay =\fIdelay\fR -Set the delay in seconds before the first check for updates. -.TP -.BR \-h ", " \-? ", " \-\-help -Print a summary of all command line options and exit. -.TP -.BR \-i ", " \-\-interval =\fIinterval\fR -Set the interval in seconds between checks for updates. -.TP -.BR \-v ", " \-\-version -Print the version number and exit. -.SH EXIT STATUS -.TP -.B 0 -The program has exited normally. -.TP -.B >0 -An Error has occurred. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pk-update-icon-0.2.2/pk-update-icon.1.xml new/pk-update-icon-1/pk-update-icon.1.xml --- old/pk-update-icon-0.2.2/pk-update-icon.1.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/pk-update-icon-1/pk-update-icon.1.xml 2014-02-07 18:10:41.000000000 +0100 @@ -0,0 +1,172 @@ +<?xml version="1.0"?> +<!-- + +Copyright (C) 2014 Guido Berhoerster <[email protected]> + +Licensed under the GNU General Public License Version 2 + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +--> +<refentry xmlns="http://docbook.org/ns/docbook"; xml:lang="en"> + <info> + <author> + <personname> + <firstname>Guido</firstname> + <surname>Berhoerster</surname> + </personname> + <email>[email protected]</email> + <personblurb/> + </author> + <date>7 February, 2014</date> + </info> + <refmeta> + <refentrytitle>pk-update-icon</refentrytitle> + <manvolnum>1</manvolnum> + <refmiscinfo class="source"/> + <refmiscinfo class="version"/> + <refmiscinfo class="manual">User Commands</refmiscinfo> + </refmeta> + <refnamediv> + <refname>pk-update-icon</refname> + <refpurpose>display notifications about software updates</refpurpose> + </refnamediv> + <refsynopsisdiv> + <cmdsynopsis> + <command>pk-update-icon</command> + <group> + <arg choice="plain"> + <option>-h</option> + </arg> + <arg choice="plain"> + <option>-?</option> + </arg> + <arg choice="plain"> + <option>--help</option> + </arg> + </group> + <group> + <arg choice="plain"> + <option>-v</option> + </arg> + <arg choice="plain"> + <option>--version</option> + </arg> + </group> + <group> + <arg choice="plain"> + <option>-d</option> + <replaceable>delay</replaceable> + </arg> + <arg choice="plain"> + <option>--delay</option> + <replaceable>delay</replaceable> + </arg> + </group> + <group > + <arg choice="plain"> + <option>-i</option> + <replaceable>interval</replaceable> + </arg> + <arg choice="plain"> + <option>--interval</option> + <replaceable>interval</replaceable> + </arg> + </group> + </cmdsynopsis> + </refsynopsisdiv> + <refsect1> + <title>Description</title> + <para><command>pk-update-icon</command> displays notifications and an + icon in the tray area of the panel when package updates are + available.</para> + </refsect1> + <refsect1> + <title>Options</title> + <para>The following options are supported:</para> + <variablelist> + <varlistentry> + <term> + <option>-d</option> + <replaceable>delay</replaceable> + </term> + <term> + <option>--delay</option> + <replaceable>delay</replaceable> + </term> + <listitem> + <para>Set the delay in seconds before the first check for + updates.</para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <option>-h</option> + </term> + <term> + <option>-?</option> + </term> + <term> + <option>--help</option> + </term> + <listitem> + <para>Print a summary of all command line options and exit.</para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <option>-i</option> + <replaceable>interval</replaceable> + </term> + <term> + <option>--interval</option> + <replaceable>interval</replaceable> + </term> + <listitem> + <para>Set the interval in seconds between checks for updates.</para> + </listitem> + </varlistentry> + <varlistentry> + <term> + <option>-v</option> + </term> + <term> + <option>--version</option> + </term> + <listitem> + <para>Print the version number and exit.</para> + </listitem> + </varlistentry> + </variablelist> + </refsect1> + <refsect1> + <title>Exit Status</title> + <para>The following exit values are returned:</para> + <variablelist> + <varlistentry> + <term>0</term> + <listitem> + <para>Command successfully executed.</para> + </listitem> + </varlistentry> + <varlistentry> + <term>> 0</term> + <listitem> + <para>An error has occured.</para> + </listitem> + </varlistentry> + </variablelist> + </refsect1> +</refentry> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pk-update-icon-0.2.2/pkui-backend.c new/pk-update-icon-1/pkui-backend.c --- old/pk-update-icon-0.2.2/pkui-backend.c 2012-07-18 11:57:26.000000000 +0200 +++ new/pk-update-icon-1/pkui-backend.c 2014-02-07 21:49:35.000000000 +0100 @@ -28,17 +28,17 @@ struct _PkuiBackendPrivate { - PkuiBackend *backend; - PkClient *pk_client; - guint periodic_check_id; - guint updates_normal; - guint updates_important; - guint previous_updates_normal; - guint previous_updates_important; - guint startup_delay; - guint check_interval; - gint64 last_check; - gboolean inhibit_check; + PkuiBackend *backend; + PkClient *pk_client; + guint periodic_check_id; + guint updates_normal; + guint updates_important; + guint previous_updates_normal; + guint previous_updates_important; + guint startup_delay; + guint check_interval; + gint64 last_check; + gboolean inhibit_check; }; enum @@ -61,7 +61,7 @@ static guint pkui_backend_signals[LAST_SIGNAL] = { 0 }; -static gboolean periodic_check(gpointer data); +static gboolean periodic_check(gpointer data); static void pkui_backend_set_property(GObject *object, guint property_id, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pk-update-icon-0.2.2/pkui-backend.h new/pk-update-icon-1/pkui-backend.h --- old/pk-update-icon-0.2.2/pkui-backend.h 2012-07-18 11:56:59.000000000 +0200 +++ new/pk-update-icon-1/pkui-backend.h 2014-02-07 21:57:21.000000000 +0100 @@ -44,9 +44,8 @@ struct _PkuiBackend { - GObject parent_instance; - - PkuiBackendPrivate *priv; + GObject parent_instance; + PkuiBackendPrivate *priv; }; struct _PkuiBackendClass @@ -54,15 +53,18 @@ GObjectClass parent_class; }; -PkuiBackend *pkui_backend_new(guint startup_delay, guint interval); -guint pkui_backend_get_updates_normal(PkuiBackend *self); -guint pkui_backend_get_updates_important(PkuiBackend *self); -void pkui_backend_set_inhibit_check(PkuiBackend *self, gboolean inhibit_check); -gboolean pkui_backend_get_inhibit_check(PkuiBackend *self); -void pkui_backend_set_check_interval(PkuiBackend *self, guint check_interval); -guint pkui_backend_get_check_interval(PkuiBackend *self); -guint pkui_backend_get_startup_interval(PkuiBackend *self); -void pkui_backend_check_now(PkuiBackend *self); +GType pkui_backend_get_type(void); +PkuiBackend *pkui_backend_new(guint startup_delay, guint interval); +guint pkui_backend_get_updates_normal(PkuiBackend *self); +guint pkui_backend_get_updates_important(PkuiBackend *self); +void pkui_backend_set_inhibit_check(PkuiBackend *self, + gboolean inhibit_check); +gboolean pkui_backend_get_inhibit_check(PkuiBackend *self); +void pkui_backend_set_check_interval(PkuiBackend *self, + guint check_interval); +guint pkui_backend_get_check_interval(PkuiBackend *self); +guint pkui_backend_get_startup_interval(PkuiBackend *self); +void pkui_backend_check_now(PkuiBackend *self); G_END_DECLS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pk-update-icon-0.2.2/pkui-icon.c new/pk-update-icon-1/pkui-icon.c --- old/pk-update-icon-0.2.2/pkui-icon.c 2012-07-18 11:56:59.000000000 +0200 +++ new/pk-update-icon-1/pkui-icon.c 2014-02-07 21:55:01.000000000 +0100 @@ -39,13 +39,13 @@ NotifyNotification *notification; }; -static GtkWidget* icon_popup_menu_create(PkuiIcon *self); -static void icon_popup_menu_popup(GtkStatusIcon *status_icon, guint button, +static GtkWidget* icon_popup_menu_create(PkuiIcon *self); +static void icon_popup_menu_popup(GtkStatusIcon *status_icon, guint button, guint activate_time, gpointer user_data); -static void icon_activated(GtkStatusIcon *status_icon, gpointer user_data); -static void hide_notification(PkuiIcon *self); -static void backend_state_changed(PkuiBackend *backend, gpointer user_data); -static void update_viewer_exited(GPid pid, gint status, gpointer user_data); +static void icon_activated(GtkStatusIcon *status_icon, gpointer user_data); +static void hide_notification(PkuiIcon *self); +static void backend_state_changed(PkuiBackend *backend, gpointer user_data); +static void update_viewer_exited(GPid pid, gint status, gpointer user_data); static void pkui_icon_finalize(GObject *gobject) @@ -125,31 +125,32 @@ static void about_dialog_show(GtkMenuItem *item, gpointer user_data) { - static const gchar *copyright = "Copyright \xc2\xa9 2011 Guido " + static const gchar *copyright = "Copyright \xc2\xa9 2011 Guido " "Berhoerster\nCopyright \xc2\xa9 2011 Pavol Rusnak\n"; - static const gchar *authors[3] = { + static const gchar *authors[3] = { "Guido Berhoerster <[email protected]>", "Pavol Rusnak <[email protected]>", NULL }; - static const gchar *documenters[2] = { + static const gchar *documenters[2] = { "Guido Berhoerster <[email protected]>", NULL }; - static const gchar *license = - "Licensed under the GNU General Public License Version 2\n\nThis " - "program is free software; you can redistribute it and/or modify it" - " under the terms of the GNU General Public License as published by" - " the Free Software Foundation; either version 2 of the License, or" - " (at your option) any later version.\n\nThis program is " - "distributed in the hope that it will be useful, but WITHOUT ANY " - "WARRANTY; without even the implied warranty of MERCHANTABILITY or " - "FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public " - "License for more details.\n\nYou should have received a copy of " - "the GNU General Public License along with this program; if not, " - "write to the Free Software Foundation, Inc., 51 Franklin Street, " - "Fifth Floor, Boston, MA 02110-1301 USA."; - const gchar *translators = _("translators"); + static const gchar *license = + "Licensed under the GNU General Public License Version 2\n\n" + "This program is free software; you can redistribute it and/or " + "modify it under the terms of the GNU General Public License as " + "published by the Free Software Foundation; either version 2 of " + "the License, or (at your option) any later version.\n\n" + "This program is distributed in the hope that it will be useful, " + "but WITHOUT ANY WARRANTY; without even the implied warranty of " + "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU " + "General Public License for more details.\n\n" + "You should have received a copy of the GNU General Public License " + "along with this program; if not, write to the Free Software " + "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, " + "MA 02110-1301 USA."; + const gchar *translators = _("translators"); if (strcmp(translators, "translators") == 0) translators = NULL; @@ -202,7 +203,7 @@ icon_popup_menu_popup(GtkStatusIcon *status_icon, guint button, guint activate_time, gpointer user_data) { - PkuiIcon *self = PKUI_ICON(user_data); + PkuiIcon *self = PKUI_ICON(user_data); gtk_menu_popup(GTK_MENU(self->priv->status_icon_popup_menu), NULL, NULL, NULL, NULL, button, activate_time); @@ -212,7 +213,7 @@ notification_handle_action(NotifyNotification *notification, gchar *action, gpointer user_data) { - PkuiIcon *self = PKUI_ICON(user_data); + PkuiIcon *self = PKUI_ICON(user_data); if (strcmp(action, "install-updates") == 0) exec_update_viewer(self); @@ -222,13 +223,13 @@ update_notification(PkuiIcon *self, guint updates_normal, guint updates_important) { - gchar *message; - gchar *title = updates_important ? + gchar *message; + gchar *title = updates_important ? ngettext("Important Software Update", "Important Software Updates", updates_important + updates_normal) : ngettext("Software Update", "Software Updates", updates_important + updates_normal); - gchar *icon = updates_important ? "software-update-urgent" : + gchar *icon = updates_important ? "software-update-urgent" : "software-update-available"; if (updates_important > 0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pk-update-icon-0.2.2/pkui-icon.h new/pk-update-icon-1/pkui-icon.h --- old/pk-update-icon-0.2.2/pkui-icon.h 2012-07-18 11:56:59.000000000 +0200 +++ new/pk-update-icon-1/pkui-icon.h 2014-02-07 21:57:36.000000000 +0100 @@ -44,16 +44,17 @@ struct _PkuiIcon { - GObject parent_instance; - PkuiIconPrivate *priv; + GObject parent_instance; + PkuiIconPrivate *priv; }; struct _PkuiIconClass { - GObjectClass parent_class; + GObjectClass parent_class; }; -PkuiIcon *pkui_icon_new(guint startup_delay, guint check_interval); +GType pkui_icon_get_type(void); +PkuiIcon *pkui_icon_new(guint startup_delay, guint check_interval); G_END_DECLS -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
