aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2007-06-16 06:41:47 +0000
committerJason Woodward2007-06-16 06:41:47 +0000
commit72160f3a6f1e9eb37b5e49f255730be6d80b8dc3 (patch)
treea78dab4434d7d17df322802fe56af8d1a4ee6808
parenteaa74f2d30bfbbaf32e32149ca0f0e21594912b7 (diff)
downloadgslapt-72160f3a6f1e9eb37b5e49f255730be6d80b8dc3.tar.gz
* requires slapt-get 0.9.12
* unreference generated pixbufs where previously left referenced * Updated thread locking of download cancel variable * Failed package downloads now report why they failed
-rw-r--r--ChangeLog8
-rw-r--r--configure.in7
-rw-r--r--po/bg.po10
-rw-r--r--po/de.po10
-rw-r--r--po/en.po10
-rw-r--r--po/es.po10
-rw-r--r--po/fr.po10
-rw-r--r--po/gl_ES.po10
-rw-r--r--po/gslapt.pot12
-rw-r--r--po/id.po10
-rw-r--r--po/it.po10
-rw-r--r--po/ja.po10
-rw-r--r--po/nl.po10
-rw-r--r--po/pl.po10
-rw-r--r--po/pt.po10
-rw-r--r--po/pt_BR.po10
-rw-r--r--po/ru.po10
-rw-r--r--po/sk.po10
-rw-r--r--po/sv.po10
-rw-r--r--po/tr.po10
-rw-r--r--po/uk.po10
-rw-r--r--po/vi.po10
-rw-r--r--po/zh_CN.po10
-rw-r--r--src/callbacks.c140
24 files changed, 223 insertions, 144 deletions
diff --git a/ChangeLog b/ChangeLog
index 5946e8e..eb8c040 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
-0.3.17 Jun 04, 2007
+0.3.18 Jun 16, 2007
+ * requires slapt-get 0.9.12
+ * unreference generated pixbufs where previously left referenced
+ * Updated thread locking of download cancel variable
+ * Failed package downloads now report why they failed
* updated configure.in
+
+0.3.17 Feb 25, 2007
* Updated spanish translation by Manuel Barallobre Seoane
* Added galician translation by Manuel Barallobre Seoane
diff --git a/configure.in b/configure.in
index d4e0667..a44ac12 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_INIT
AC_CONFIG_SRCDIR([configure.in])
-AM_INIT_AUTOMAKE(gslapt, 0.3.17)
+AM_INIT_AUTOMAKE(gslapt, 0.3.18)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
@@ -33,9 +33,12 @@ AC_CHECK_HEADER(curl/curl.h, [], [AC_MSG_ERROR(libcurl headers are missing)])
AC_CHECK_HEADER(slapt.h, [], [AC_MSG_ERROR(libslapt headers are missing)])
AC_CHECK_LIB(z,gzopen, [LIBS="$LIBS -lz"], [AC_MSG_ERROR(libz is missing)])
AC_CHECK_LIB(curl,curl_global_init, [LIBS="$LIBS `curl-config --libs`"], [AC_MSG_ERROR(curl libs are missing)])
-AC_CHECK_LIB(slapt,slapt_free_source_list, [], [AC_MSG_ERROR(libslapt 0.9.11g or greater is required)])
+AC_CHECK_LIB(gpgme,gpgme_new, [LIBS="$LIBS `gpgme-config --libs`"], [AC_MSG_WARN(gpg support disabled)])
+AC_CHECK_LIB(slapt,slapt_strerror, [], [AC_MSG_ERROR(libslapt 0.9.12 or greater is required)])
LIBS="$LIBS -lglib-2.0 -lgthread-2.0"
+
+
pkg_modules="gtk+-2.0 >= 2.4.0"
PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
AC_SUBST(PACKAGE_CFLAGS)
diff --git a/po/bg.po b/po/bg.po
index 1186a7d..492582a 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.16\n"
+"Project-Id-Version: 0.3.18\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2005-02-26 22:25-0500\n"
-"PO-Revision-Date: 2006-11-11 02:51+0500\n"
+"PO-Revision-Date: 2007-06-09 11:40+0500\n"
"Last-Translator: Victor Keranov <victor_keranov@mail.bg>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -331,9 +331,6 @@ msgstr "Статус"
msgid "Source download failed"
msgstr "Неуспех при изтегляне от източника"
-msgid "Package(s) failed to download"
-msgstr "Неуспех при изтеглянето на пакет(и)"
-
msgid "pkgtools returned an error"
msgstr "pkgtools съобщи за грешка"
@@ -478,3 +475,6 @@ msgstr "Mark all obsolete packages"
msgid "Download rate: %.0f%s/s"
msgstr "Download rate: %.0f%s/s"
+msgid "Failed to download %s: %s"
+msgstr "Failed to download %s: %s"
+
diff --git a/po/de.po b/po/de.po
index 9486062..9a7fbc8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,10 +6,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.16\n"
+"Project-Id-Version: 0.3.18\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2005-02-26 22:25-0500\n"
-"PO-Revision-Date: 2006-11-11 02:51+0500\n"
+"PO-Revision-Date: 2007-06-09 11:40+0500\n"
"Last-Translator: Manfred Mueller <mmueller@nekserve.de>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -333,9 +333,6 @@ msgstr "Status"
msgid "Source download failed"
msgstr "Quell-Download gescheitert"
-msgid "Package(s) failed to download"
-msgstr "Konnte kein(e) Paket(e) laden"
-
msgid "pkgtools returned an error"
msgstr "pkgtools meldete Fehler"
@@ -477,3 +474,6 @@ msgstr "Markiere ALLE veralteten Pakete"
msgid "Download rate: %.0f%s/s"
msgstr "Download rate: %.0f%s/s"
+msgid "Failed to download %s: %s"
+msgstr "Failed to download %s: %s"
+
diff --git a/po/en.po b/po/en.po
index e2be29f..d398502 100644
--- a/po/en.po
+++ b/po/en.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.16\n"
+"Project-Id-Version: 0.3.18\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2005-02-20 16:24-0500\n"
-"PO-Revision-Date: 2006-11-11 02:51+0500\n"
+"PO-Revision-Date: 2007-06-09 11:40+0500\n"
"Last-Translator: Jason Woodward <woodwardj@jaos.org>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -329,9 +329,6 @@ msgstr "Status"
msgid "Source download failed"
msgstr "Source download failed"
-msgid "Package(s) failed to download"
-msgstr "Package(s) failed to download"
-
msgid "pkgtools returned an error"
msgstr "pkgtools returned an error"
@@ -473,3 +470,6 @@ msgstr "Mark all obsolete packages"
msgid "Download rate: %.0f%s/s"
msgstr "Download rate: %.0f%s/s"
+msgid "Failed to download %s: %s"
+msgstr "Failed to download %s: %s"
+
diff --git a/po/es.po b/po/es.po
index 6a39960..8cd09c9 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.17\n"
+"Project-Id-Version: 0.3.18\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2005-02-26 22:25-0500\n"
-"PO-Revision-Date: 2007-02-20 16:37+0100\n"
+"PO-Revision-Date: 2007-06-09 11:40+0500\n"
"Last-Translator: Manuel Barallobre Seoane <bara666@gmail.com>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -325,9 +325,6 @@ msgstr "Estado"
msgid "Source download failed"
msgstr "Fallo en la descarga desde la fuente"
-msgid "Package(s) failed to download"
-msgstr "Fallo al descargar paquete(s)"
-
msgid "pkgtools returned an error"
msgstr "pkgtools devolvio un error"
@@ -469,3 +466,6 @@ msgstr "Marcar todos los paquetes obsoletos"
msgid "Download rate: %.0f%s/s"
msgstr "Velocidad de descarga: %.0f%s/s"
+msgid "Failed to download %s: %s"
+msgstr "Failed to download %s: %s"
+
diff --git a/po/fr.po b/po/fr.po
index 3d6603c..7cd7599 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.16\n"
+"Project-Id-Version: 0.3.18\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2005-02-26 22:25-0500\n"
-"PO-Revision-Date: 2006-11-11 02:51+0500\n"
+"PO-Revision-Date: 2007-06-09 11:40+0500\n"
"Last-Translator: Natim <natim@trunat.fr>\n"
"Language-Team: <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -334,9 +334,6 @@ msgstr "Status"
msgid "Source download failed"
msgstr "Le tlchargement de la source chou"
-msgid "Package(s) failed to download"
-msgstr "Impossible de tlcharger le(s) paquet(s)"
-
msgid "pkgtools returned an error"
msgstr "pkgtools a retourn une erreur"
@@ -481,3 +478,6 @@ msgstr "Marquer tous les packets obsoltes"
msgid "Download rate: %.0f%s/s"
msgstr "Download rate: %.0f%s/s"
+msgid "Failed to download %s: %s"
+msgstr "Failed to download %s: %s"
+
diff --git a/po/gl_ES.po b/po/gl_ES.po
index aa9fb78..3e9ad30 100644
--- a/po/gl_ES.po
+++ b/po/gl_ES.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.17\n"
+"Project-Id-Version: 0.3.18\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2005-02-26 22:25-0500\n"
-"PO-Revision-Date: 2007-02-20 16:37+0100\n"
+"PO-Revision-Date: 2007-06-09 11:40+0500\n"
"Last-Translator: Manuel Barallobre Seoane <bara666@gmail.com>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -331,9 +331,6 @@ msgstr "Estado"
msgid "Source download failed"
msgstr "Descarga da fonte fallida"
-msgid "Package(s) failed to download"
-msgstr "Fallo da descarga do(s) paquete(s)"
-
msgid "pkgtools returned an error"
msgstr "pkgtools devolveron un erro"
@@ -478,3 +475,6 @@ msgstr "Marcar todos os paquetes obsoletos"
msgid "Download rate: %.0f%s/s"
msgstr "Velocidade de descarga: %.0f%s/s"
+msgid "Failed to download %s: %s"
+msgstr "Failed to download %s: %s"
+
diff --git a/po/gslapt.pot b/po/gslapt.pot
index 80f2637..bfa46c2 100644
--- a/po/gslapt.pot
+++ b/po/gslapt.pot
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.16\n"
+"Project-Id-Version: 0.3.18\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2005-02-26 22:25-0500\n"
-"PO-Revision-Date: 2006-11-11 02:51+0500\n"
+"PO-Revision-Date: 2007-06-09 11:40+0500\n"
"Last-Translator: Jason Woodward <woodwardj@jaos.org>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -333,9 +333,6 @@ msgstr ""
msgid "Source download failed"
msgstr ""
-msgid "Package(s) failed to download"
-msgstr ""
-
msgid "pkgtools returned an error"
msgstr ""
@@ -478,5 +475,8 @@ msgid "Mark all obsolete packages"
msgstr ""
msgid "Download rate: %.0f%s/s"
-msgstr "Download rate: %.0f%s/s"
+msgstr ""
+
+msgid "Failed to download %s: %s"
+msgstr ""
diff --git a/po/id.po b/po/id.po
index 2b59cc1..c653e80 100644
--- a/po/id.po
+++ b/po/id.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.16\n"
+"Project-Id-Version: 0.3.18\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2005-02-26 22:25-0500\n"
-"PO-Revision-Date: 2006-11-11 02:51+0500\n"
+"PO-Revision-Date: 2007-06-09 11:40+0500\n"
"Last-Translator: Kemas Antonius <kyantonius@kyantonius.com>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -331,9 +331,6 @@ msgstr "Status"
msgid "Source download failed"
msgstr "Download sumber gagal"
-msgid "Package(s) failed to download"
-msgstr "Paket gagal di-download"
-
msgid "pkgtools returned an error"
msgstr "pkgtools melaporkan sebuah kesalahan"
@@ -478,3 +475,6 @@ msgstr "Mark all obsolete packages"
msgid "Download rate: %.0f%s/s"
msgstr "Download rate: %.0f%s/s"
+msgid "Failed to download %s: %s"
+msgstr "Failed to download %s: %s"
+
diff --git a/po/it.po b/po/it.po
index 2a1f7cd..b704f4a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,10 +6,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.16\n"
+"Project-Id-Version: 0.3.18\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2005-07-28 18:01+0000\n"
-"PO-Revision-Date: 2006-11-11 02:51+0500\n"
+"PO-Revision-Date: 2007-06-09 11:40+0500\n"
"Last-Translator: Fabio Varesano <fvaresano@yahoo.it>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -338,9 +338,6 @@ msgstr "Stato"
msgid "Source download failed"
msgstr "Download fonte fallito"
-msgid "Package(s) failed to download"
-msgstr "Pacchetto/i failed to download"
-
msgid "pkgtools returned an error"
msgstr "pkgtools ha restituito un errore"
@@ -482,3 +479,6 @@ msgstr "Mark all obsolete packages"
msgid "Download rate: %.0f%s/s"
msgstr "Download rate: %.0f%s/s"
+msgid "Failed to download %s: %s"
+msgstr "Failed to download %s: %s"
+
diff --git a/po/ja.po b/po/ja.po
index ade0ff2..8f3f10f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,10 +6,10 @@
# JW <J_W@somewhere.c0.jp>, 2006.
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.16\n"
+"Project-Id-Version: 0.3.18\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2006-03-07 20:26+0900\n"
-"PO-Revision-Date: 2006-11-11 02:51+0500\n"
+"PO-Revision-Date: 2007-06-09 11:40+0500\n"
"Last-Translator: JW <J_W@somewhere.c0.jp>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -331,9 +331,6 @@ msgstr "状態"
msgid "Source download failed"
msgstr "ソースのダウンロードに失敗しました"
-msgid "Package(s) failed to download"
-msgstr "パッケージのダウンロードに失敗しました"
-
msgid "pkgtools returned an error"
msgstr "pkgtools がエラーを返しました"
@@ -481,3 +478,6 @@ msgstr "Mark all obsolete packages"
msgid "Download rate: %.0f%s/s"
msgstr "Download rate: %.0f%s/s"
+msgid "Failed to download %s: %s"
+msgstr "Failed to download %s: %s"
+
diff --git a/po/nl.po b/po/nl.po
index 1f00107..0efb1bd 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,10 +6,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.16\n"
+"Project-Id-Version: 0.3.18\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2005-08-18 23:06+0200\n"
-"PO-Revision-Date: 2006-11-11 02:51+0500\n"
+"PO-Revision-Date: 2007-06-09 11:40+0500\n"
"Last-Translator: Martijn Dekker <martijn@inlv.demon.nl>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -333,9 +333,6 @@ msgstr "Status"
msgid "Source download failed"
msgstr "Binnenhalen bron mislukt"
-msgid "Package(s) failed to download"
-msgstr "Pakket(ten) konden niet worden binnengehaald"
-
msgid "pkgtools returned an error"
msgstr "pkgtools gaf een foutmelding"
@@ -480,3 +477,6 @@ msgstr "Mark all obsolete packages"
msgid "Download rate: %.0f%s/s"
msgstr "Download rate: %.0f%s/s"
+msgid "Failed to download %s: %s"
+msgstr "Failed to download %s: %s"
+
diff --git a/po/pl.po b/po/pl.po
index 1d17458..978af6f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.16\n"
+"Project-Id-Version: 0.3.18\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2005-02-17 14:52-0500\n"
-"PO-Revision-Date: 2006-11-11 02:51+0500\n"
+"PO-Revision-Date: 2007-06-09 11:40+0500\n"
"Last-Translator: Piotr Simon <sajmon@tenboard.com>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -305,9 +305,6 @@ msgstr "Status"
msgid "Source download failed"
msgstr "Pobieranie rda nie powiodo si"
-msgid "Package(s) failed to download"
-msgstr "Pobranie pakietu(w) nie powiodo si"
-
msgid "pkgtools returned an error"
msgstr "pkgtools zwrci bd"
@@ -449,3 +446,6 @@ msgstr "Mark all obsolete packages"
msgid "Download rate: %.0f%s/s"
msgstr "Download rate: %.0f%s/s"
+msgid "Failed to download %s: %s"
+msgstr "Failed to download %s: %s"
+
diff --git a/po/pt.po b/po/pt.po
index 76b2efd..6d8759b 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.16\n"
+"Project-Id-Version: 0.3.18\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2005-05-06 11:10-0500\n"
-"PO-Revision-Date: 2006-11-11 02:51+0500\n"
+"PO-Revision-Date: 2007-06-09 11:40+0500\n"
"Last-Translator: Pedro Pinto aka _PN_boy <pedro_nuno_pn@zmail.pt>\n"
"Language-Team: slapt-get devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -325,9 +325,6 @@ msgstr "Estado"
msgid "Source download failed"
msgstr "Download da fonte falhou"
-msgid "Package(s) failed to download"
-msgstr "Falhou ao descarregar o(s) Pacote(s)"
-
msgid "pkgtools returned an error"
msgstr "pkgtools returnou um erro"
@@ -469,3 +466,6 @@ msgstr "Mark all obsolete packages"
msgid "Download rate: %.0f%s/s"
msgstr "Download rate: %.0f%s/s"
+msgid "Failed to download %s: %s"
+msgstr "Failed to download %s: %s"
+
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 53c4d7e..da348e2 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.16\n"
+"Project-Id-Version: 0.3.18\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2005-02-26 22:25-0500\n"
-"PO-Revision-Date: 2006-11-11 02:51+0500\n"
+"PO-Revision-Date: 2007-06-09 11:40+0500\n"
"Last-Translator: Frederico Henrique Gonalves Lima <fredhgl@yahoo.com.br>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -332,9 +332,6 @@ msgstr "Status"
msgid "Source download failed"
msgstr "Falha ao descarregar origem"
-msgid "Package(s) failed to download"
-msgstr "Falha(s) ao descarregar pacote(s)"
-
msgid "pkgtools returned an error"
msgstr "pkgtools retornou um erro"
@@ -479,3 +476,6 @@ msgstr "Mark all obsolete packages"
msgid "Download rate: %.0f%s/s"
msgstr "Download rate: %.0f%s/s"
+msgid "Failed to download %s: %s"
+msgstr "Failed to download %s: %s"
+
diff --git a/po/ru.po b/po/ru.po
index 2db80e9..35f5b10 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,10 +6,10 @@
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.16\n"
+"Project-Id-Version: 0.3.18\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2005-09-08 00:54\n"
-"PO-Revision-Date: 2006-11-11 02:51+0500\n"
+"PO-Revision-Date: 2007-06-09 11:40+0500\n"
"Last-Translator: sin <digitalhunger@gmail.com>\n"
"Language-Team: DeepStyle team <deep@deepstyle.org.ua>\n"
"MIME-Version: 1.0\n"
@@ -306,9 +306,6 @@ msgstr ""
msgid "Source download failed"
msgstr " "
-msgid "Package(s) failed to download "
-msgstr " "
-
msgid "pkgtools returned an error"
msgstr " pkgtools"
@@ -444,3 +441,6 @@ msgstr "Mark all obsolete packages"
msgid "Download rate: %.0f%s/s"
msgstr "Download rate: %.0f%s/s"
+msgid "Failed to download %s: %s"
+msgstr "Failed to download %s: %s"
+
diff --git a/po/sk.po b/po/sk.po
index 3354166..72c5b06 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.16\n"
+"Project-Id-Version: 0.3.18\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2005-06-23 21:28-0500\n"
-"PO-Revision-Date: 2006-11-11 02:51+0500\n"
+"PO-Revision-Date: 2007-06-09 11:40+0500\n"
"Last-Translator: Erik Gyepes <depi@depi.sk>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -329,9 +329,6 @@ msgstr "Stav"
msgid "Source download failed"
msgstr "Sahovanie zlyhalo"
-msgid "Package(s) failed to download"
-msgstr "Zlyhalo sahovanie balka(ov)"
-
msgid "pkgtools returned an error"
msgstr "pkgtools vrtil chybu"
@@ -473,3 +470,6 @@ msgstr "Mark all obsolete packages"
msgid "Download rate: %.0f%s/s"
msgstr "Download rate: %.0f%s/s"
+msgid "Failed to download %s: %s"
+msgstr "Failed to download %s: %s"
+
diff --git a/po/sv.po b/po/sv.po
index 8be11d4..92da08a 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.16\n"
+"Project-Id-Version: 0.3.18\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2005-02-26 22:25-0500\n"
-"PO-Revision-Date: 2006-11-11 02:51+0500\n"
+"PO-Revision-Date: 2007-06-09 11:40+0500\n"
"Last-Translator: Hakan Lindqvist <tfy00hlt@cs.umu.se>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -329,9 +329,6 @@ msgstr "Status"
msgid "Source download failed"
msgstr "Source download failed"
-msgid "Package(s) failed to download"
-msgstr "Package(s) failed to download"
-
msgid "pkgtools returned an error"
msgstr "pkgtools returned an error"
@@ -473,3 +470,6 @@ msgstr "Mark all obsolete packages"
msgid "Download rate: %.0f%s/s"
msgstr "Download rate: %.0f%s/s"
+msgid "Failed to download %s: %s"
+msgstr "Failed to download %s: %s"
+
diff --git a/po/tr.po b/po/tr.po
index 95269f2..1879074 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,10 +4,10 @@
# Bekir SONAT <bekirsonat@kde.org.tr>, 2006.
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.16\n"
+"Project-Id-Version: 0.3.18\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2005-02-26 22:25-0500\n"
-"PO-Revision-Date: 2006-11-13 19:21+0200\n"
+"PO-Revision-Date: 2007-06-09 11:40+0500\n"
"Last-Translator: Bekir SONAT <bekirsonat@kde.org.tr>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -341,9 +341,6 @@ msgstr "Durum"
msgid "Source download failed"
msgstr "Kaynak indirme başarısız"
-msgid "Package(s) failed to download"
-msgstr "Paket(ler)i indirme başarısız"
-
msgid "pkgtools returned an error"
msgstr "pkgtools hata bildiriyor"
@@ -489,3 +486,6 @@ msgstr "Tüm terkedilmiş paketleri göster"
msgid "Download rate: %.0f%s/s"
msgstr "İndirme hızı: %.0f%s/s"
+msgid "Failed to download %s: %s"
+msgstr "Failed to download %s: %s"
+
diff --git a/po/uk.po b/po/uk.po
index 1c8bed8..9cb4716 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,10 +6,10 @@
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.16\n"
+"Project-Id-Version: 0.3.18\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2005-09-08 00:54\n"
-"PO-Revision-Date: 2006-11-11 02:51+0500\n"
+"PO-Revision-Date: 2007-06-09 11:40+0500\n"
"Last-Translator: sin <digitalhunger@gmail.com>\n"
"Language-Team: DeepStyle team <deep@deepstyle.org.ua>\n"
"MIME-Version: 1.0\n"
@@ -306,9 +306,6 @@ msgstr ""
msgid "Source download failed"
msgstr " "
-msgid "Package(s) failed to download "
-msgstr " "
-
msgid "pkgtools returned an error"
msgstr " pkgtools"
@@ -444,3 +441,6 @@ msgstr "Mark all obsolete packages"
msgid "Download rate: %.0f%s/s"
msgstr "Download rate: %.0f%s/s"
+msgid "Failed to download %s: %s"
+msgstr "Failed to download %s: %s"
+
diff --git a/po/vi.po b/po/vi.po
index 42745b1..9579752 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.16\n"
+"Project-Id-Version: 0.3.18\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2005-02-26 22:25-0500\n"
-"PO-Revision-Date: 2006-11-11 02:51+0500\n"
+"PO-Revision-Date: 2007-06-09 11:40+0500\n"
"Last-Translator: Nguyễn Văn Vũ <vncasper@yahoo.com>\n"
"Language-Team: gnome-vi <gnomevi-list@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
@@ -329,9 +329,6 @@ msgstr "Trạng thái"
msgid "Source download failed"
msgstr "Nguồn dữ liệu bị lỗi"
-msgid "Package(s) failed to download"
-msgstr "Bị lỗi trong khi lấy dữ liệu"
-
msgid "pkgtools returned an error"
msgstr "pkgtools trả về một lỗi"
@@ -473,3 +470,6 @@ msgstr "Mark all obsolete packages"
msgid "Download rate: %.0f%s/s"
msgstr "Download rate: %.0f%s/s"
+msgid "Failed to download %s: %s"
+msgstr "Failed to download %s: %s"
+
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2e2c97a..f14681a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: 0.3.16\n"
+"Project-Id-Version: 0.3.18\n"
"Report-Msgid-Bugs-To: slapt-get-devel@software.jaos.org\n"
"POT-Creation-Date: 2005-02-26 22:25-0500\n"
-"PO-Revision-Date: 2006-11-11 02:51+0500\n"
+"PO-Revision-Date: 2007-06-09 11:40+0500\n"
"Last-Translator: Yang Jinsong <shannleon@gmail.com>\n"
"Language-Team: slapt-get-devel <slapt-get-devel@software.jaos.org>\n"
"MIME-Version: 1.0\n"
@@ -332,9 +332,6 @@ msgstr "状态"
msgid "Source download failed"
msgstr "源下载失败"
-msgid "Package(s) failed to download"
-msgstr "软件包下载失败"
-
msgid "pkgtools returned an error"
msgstr "pkgtools 返回一个错误"
@@ -480,3 +477,6 @@ msgstr "Mark all obsolete packages"
msgid "Download rate: %.0f%s/s"
msgstr "Download rate: %.0f%s/s"
+msgid "Failed to download %s: %s"
+msgstr "Failed to download %s: %s"
+
diff --git a/src/callbacks.c b/src/callbacks.c
index 96c20b2..7ca37d6 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -38,6 +38,7 @@ extern struct slapt_source_list *disabled_sources;
static GtkWidget *progress_window;
+G_LOCK_DEFINE_STATIC (_cancelled);
static volatile guint _cancelled = 0;
static gboolean sources_modified = FALSE;
static gboolean excludes_modified = FALSE;
@@ -61,7 +62,7 @@ static void unlock_toolbar_buttons (void);
static void build_sources_treeviewlist (GtkWidget *treeview);
static void build_exclude_treeviewlist (GtkWidget *treeview);
static int populate_transaction_window (GtkWidget *trans_window);
-static gboolean download_packages (void);
+char *download_packages (void);
static gboolean install_packages (void);
static gboolean write_preferences (void);
static void set_execute_active (void);
@@ -97,6 +98,7 @@ void on_gslapt_destroy (GtkObject *object, gpointer user_data)
slapt_free_pkg_list(all);
slapt_free_pkg_list(installed);
slapt_free_rc_config(global_config);
+ slapt_free_source_list(disabled_sources);
gtk_main_quit();
exit(0);
@@ -521,6 +523,7 @@ void build_package_treeviewlist (GtkWidget *treeview)
-1
);
+ gdk_pixbuf_unref(status_icon);
g_free(status);
g_free(short_desc);
}
@@ -566,6 +569,7 @@ void build_package_treeviewlist (GtkWidget *treeview)
-1
);
+ gdk_pixbuf_unref(status_icon);
g_free(status);
g_free(short_desc);
}
@@ -953,7 +957,9 @@ static void get_package_data (void)
dl_files = (global_config->sources->count * 4.0 );
if (_cancelled == 1) {
+ G_LOCK(_cancelled);
_cancelled = 0;
+ G_UNLOCK(_cancelled);
gdk_threads_enter();
gslapt_clear_status(context_id);
gtk_widget_destroy(progress_window);
@@ -967,9 +973,12 @@ static void get_package_data (void)
struct slapt_pkg_list *available_pkgs = NULL;
struct slapt_pkg_list *patch_pkgs = NULL;
FILE *tmp_checksum_f = NULL;
+ unsigned int compressed = 0;
if (_cancelled == 1) {
+ G_LOCK(_cancelled);
_cancelled = 0;
+ G_UNLOCK(_cancelled);
gdk_threads_enter();
gslapt_clear_status(context_id);
gtk_widget_destroy(progress_window);
@@ -987,7 +996,8 @@ static void get_package_data (void)
/* download our SLAPT_PKG_LIST */
available_pkgs =
slapt_get_pkg_source_packages(global_config,
- global_config->sources->url[i]);
+ global_config->sources->url[i],
+ &compressed);
/* make sure we found a package listing */
if (available_pkgs == NULL) {
@@ -996,7 +1006,9 @@ static void get_package_data (void)
gdk_threads_enter();
if (_cancelled == 1) {
+ G_LOCK(_cancelled);
_cancelled = 0;
+ G_UNLOCK(_cancelled);
gtk_widget_destroy(progress_window);
unlock_toolbar_buttons();
gslapt_clear_status(context_id);
@@ -1036,7 +1048,9 @@ static void get_package_data (void)
++dl_count;
if (_cancelled == 1) {
+ G_LOCK(_cancelled);
_cancelled = 0;
+ G_UNLOCK(_cancelled);
gdk_threads_enter();
gslapt_clear_status(context_id);
gtk_widget_destroy(progress_window);
@@ -1055,11 +1069,14 @@ static void get_package_data (void)
/* download SLAPT_PATCHES_LIST */
patch_pkgs =
slapt_get_pkg_source_patches(global_config,
- global_config->sources->url[i]);
+ global_config->sources->url[i],
+ &compressed);
if (_cancelled == 1) {
+ G_LOCK(_cancelled);
_cancelled = 0;
+ G_UNLOCK(_cancelled);
gdk_threads_enter();
gslapt_clear_status(context_id);
gtk_widget_destroy(progress_window);
@@ -1080,14 +1097,17 @@ static void get_package_data (void)
/* download checksum file */
tmp_checksum_f =
slapt_get_pkg_source_checksums(global_config,
- global_config->sources->url[i]);
+ global_config->sources->url[i],
+ &compressed);
if (tmp_checksum_f == NULL) {
gdk_threads_enter();
gslapt_clear_status(context_id);
gtk_widget_destroy(progress_window);
if (_cancelled == 1) {
+ G_LOCK(_cancelled);
_cancelled = 0;
+ G_UNLOCK(_cancelled);
unlock_toolbar_buttons();
} else {
notify((gchar *)_("Source download failed"),global_config->sources->url[i]);
@@ -1106,7 +1126,8 @@ static void get_package_data (void)
gdk_threads_leave();
slapt_get_pkg_source_changelog(global_config,
- global_config->sources->url[i]);
+ global_config->sources->url[i],
+ &compressed);
@@ -1202,6 +1223,10 @@ int gtk_progress_callback(void *data, double dltotal, double dlnow,
return -1;
}
+ if (p_bar == NULL) {
+ return -1;
+ }
+
if ( dltotal != 0.0 )
perc = ((dlnow * 100)/dltotal)/100;
@@ -1326,15 +1351,25 @@ static void lhandle_transaction (GtkWidget *w)
/* download the pkgs */
if ( trans->install_pkgs->pkg_count > 0 || trans->upgrade_pkgs->pkg_count > 0 ) {
- if ( download_packages() == FALSE ) {
+ char *err = download_packages();
+ if ( err != NULL || _cancelled == 1) {
+
gdk_threads_enter();
- if (_cancelled == 1) {
- _cancelled = 0;
- } else {
- notify((gchar *)_("Error"),(gchar *)_("Package(s) failed to download"));
+ if (err != NULL && _cancelled == 0) {
+ notify((gchar *)_("Error"),(gchar *)err);
}
unlock_toolbar_buttons();
gdk_threads_leave();
+
+ if (_cancelled == 1) {
+ G_LOCK(_cancelled);
+ _cancelled = 0;
+ G_UNLOCK(_cancelled);
+ }
+ if (err != NULL) {
+ free(err);
+ }
+
return;
}
}
@@ -1352,7 +1387,9 @@ static void lhandle_transaction (GtkWidget *w)
}
if (_cancelled == 1) {
+ G_LOCK(_cancelled);
_cancelled = 0;
+ G_UNLOCK(_cancelled);
gdk_threads_enter();
unlock_toolbar_buttons();
rebuild_treeviews(NULL,FALSE);
@@ -1419,26 +1456,35 @@ static void build_sources_treeviewlist(GtkWidget *treeview)
);
for (i = 0; i < global_config->sources->count; ++i) {
+ GdkPixbuf *status_icon = NULL;
if ( global_config->sources->url[i] == NULL )
continue;
+ status_icon = create_pixbuf("pkg_action_installed.png");
+
gtk_list_store_append(store, &iter);
gtk_list_store_set(store,&iter,
- 0,create_pixbuf("pkg_action_installed.png"),
+ 0,status_icon,
1,global_config->sources->url[i],
2,TRUE,
-1);
+
+ gdk_pixbuf_unref(status_icon);
}
/* show disabled sources here */
for (i = 0; i < disabled_sources->count; ++i) {
+ GdkPixbuf *status_icon = create_pixbuf("pkg_action_installed.png");
+
gtk_list_store_append(store, &iter);
gtk_list_store_set(store,&iter,
- 0,create_pixbuf("pkg_action_available.png"),
+ 0,status_icon,
1,disabled_sources->url[i],
2,FALSE,
-1);
+
+ gdk_pixbuf_unref(status_icon);
}
/* column for enabled status */
@@ -1771,12 +1817,13 @@ static void mark_upgrade_packages (void)
}
}
-static gboolean download_packages (void)
+char *download_packages (void)
{
GtkLabel *progress_action_label,*progress_message_label,*progress_pkg_desc;
GtkProgressBar *p_bar;
guint i,context_id;
gfloat pkgs_to_dl = 0.0,count = 0.0;
+ const char *err = NULL;
pkgs_to_dl += trans->install_pkgs->pkg_count;
pkgs_to_dl += trans->upgrade_pkgs->pkg_count;
@@ -1799,7 +1846,7 @@ static gboolean download_packages (void)
gtk_widget_destroy(progress_window);
gslapt_clear_status(context_id);
gdk_threads_leave();
- return FALSE;
+ return NULL;
}
for (i = 0; i < trans->install_pkgs->pkg_count;++i) {
@@ -1837,15 +1884,17 @@ static gboolean download_packages (void)
gtk_widget_destroy(progress_window);
gslapt_clear_status(context_id);
gdk_threads_leave();
- return FALSE;
+ return NULL;
}
- if ( slapt_download_pkg(global_config,trans->install_pkgs->pkgs[i]) == -1) {
+ err = slapt_download_pkg(global_config,trans->install_pkgs->pkgs[i]);
+ if (err) {
gdk_threads_enter();
gtk_widget_destroy(progress_window);
gslapt_clear_status(context_id);
gdk_threads_leave();
- return FALSE;
+ return g_strdup_printf(_("Failed to download %s: %s"),
+ trans->install_pkgs->pkgs[i]->name, err);
}
++count;
}
@@ -1884,15 +1933,17 @@ static gboolean download_packages (void)
gtk_widget_destroy(progress_window);
gslapt_clear_status(context_id);
gdk_threads_leave();
- return FALSE;
+ return NULL;
}
- if (slapt_download_pkg(global_config,trans->upgrade_pkgs->pkgs[i]->upgrade) == -1) {
+ err = slapt_download_pkg(global_config,trans->upgrade_pkgs->pkgs[i]->upgrade);
+ if (err) {
gdk_threads_enter();
gtk_widget_destroy(progress_window);
gslapt_clear_status(context_id);
gdk_threads_leave();
- return FALSE;
+ return g_strdup_printf("Failed to download %s: %s",
+ trans->upgrade_pkgs->pkgs[i]->upgrade->name, err);
}
++count;
}
@@ -1901,8 +1952,7 @@ static gboolean download_packages (void)
gtk_widget_destroy(progress_window);
gslapt_clear_status(context_id);
gdk_threads_leave();
-
- return TRUE;
+ return NULL;
}
static gboolean install_packages (void)
@@ -2486,11 +2536,15 @@ void unmark_package(GtkWidget *gslapt, gpointer user_data)
model = GTK_TREE_MODEL(gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(filter_model)));
if (is_installed == 1) {
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_installed.png"),-1);
+ GdkPixbuf *status_icon = create_pixbuf("pkg_action_installed.png");
+ gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_ICON_COLUMN,status_icon,-1);
status = g_strdup_printf("a%s",pkg->name);
+ gdk_pixbuf_unref(status_icon);
} else {
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_available.png"),-1);
+ GdkPixbuf *status_icon = create_pixbuf("pkg_action_available.png");
+ gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_ICON_COLUMN,status_icon,-1);
status = g_strdup_printf("z%s",pkg->name);
+ gdk_pixbuf_unref(status_icon);
}
gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_COLUMN,status,-1);
g_free(status);
@@ -2508,9 +2562,11 @@ void unmark_package(GtkWidget *gslapt, gpointer user_data)
if (set_iter_to_pkg(model,&actual_iter,installed_pkg)) {
gchar *istatus = g_strdup_printf("i%s",installed_pkg->name);
- gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_installed.png"),-1);
+ GdkPixbuf *status_icon = create_pixbuf("pkg_action_installed.png");
+ gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_ICON_COLUMN,status_icon,-1);
gtk_list_store_set(GTK_LIST_STORE(model),&actual_iter,STATUS_COLUMN,istatus,-1);
g_free(istatus);
+ gdk_pixbuf_unref(status_icon);
} else {
fprintf(stderr,"failed to find iter for installed package %s-%s to unmark\n",trans->upgrade_pkgs->pkgs[i]->installed->name,trans->upgrade_pkgs->pkgs[i]->installed->version);
}
@@ -2764,7 +2820,9 @@ void open_icon_legend (GtkObject *object, gpointer user_data)
void on_button_cancel_clicked (GtkButton *button, gpointer user_data)
{
+ G_LOCK(_cancelled);
_cancelled = 1;
+ G_UNLOCK(_cancelled);
}
static void build_package_action_menu (slapt_pkg_info_t *pkg)
@@ -3007,9 +3065,7 @@ struct slapt_source_list *parse_disabled_package_sources (const char *file_name)
char *getline_buffer = NULL;
size_t gb_length = 0;
ssize_t g_size;
- struct slapt_source_list *list = slapt_malloc(sizeof *list);
- list->url = slapt_malloc(sizeof *list->url);
- list->count = 0;
+ struct slapt_source_list *list = slapt_init_source_list();
rc = slapt_open_file(file_name,"r");
if (rc == NULL)
@@ -3063,15 +3119,19 @@ static gboolean toggle_source_status (GtkTreeView *treeview, gpointer data)
gtk_tree_model_get(model,&iter,1,&source,2,&status,-1 );
if (status) { /* is active */
+ GdkPixbuf *status_icon = create_pixbuf("pkg_action_available.png");
gtk_list_store_set(GTK_LIST_STORE(model),&iter,
- 0,create_pixbuf("pkg_action_available.png"),
+ 0,status_icon,
2,FALSE,
-1);
+ gdk_pixbuf_unref(status_icon);
} else { /* is not active */
+ GdkPixbuf *status_icon = create_pixbuf("pkg_action_installed.png");
gtk_list_store_set(GTK_LIST_STORE(model),&iter,
- 0,create_pixbuf("pkg_action_installed.png"),
+ 0,status_icon,
2,TRUE,
-1);
+ gdk_pixbuf_unref(status_icon);
}
sources_modified = TRUE;
@@ -3328,50 +3388,60 @@ static int set_iter_for_install(GtkTreeModel *model, GtkTreeIter *iter,
slapt_pkg_info_t *pkg)
{
gchar *status = g_strdup_printf("i%s",pkg->name);
- gtk_list_store_set(GTK_LIST_STORE(model),iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_install.png"),-1);
+ GdkPixbuf *status_icon = create_pixbuf("pkg_action_install.png");
+ gtk_list_store_set(GTK_LIST_STORE(model),iter,STATUS_ICON_COLUMN,status_icon,-1);
gtk_list_store_set(GTK_LIST_STORE(model),iter,STATUS_COLUMN,status,-1);
gtk_list_store_set(GTK_LIST_STORE(model),iter,MARKED_COLUMN,TRUE,-1);
g_free(status);
+ gdk_pixbuf_unref(status_icon);
}
static int set_iter_for_reinstall(GtkTreeModel *model, GtkTreeIter *iter,
slapt_pkg_info_t *pkg)
{
gchar *status = g_strdup_printf("u%s",pkg->name);
- gtk_list_store_set(GTK_LIST_STORE(model),iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_reinstall.png"),-1);
+ GdkPixbuf *status_icon = create_pixbuf("pkg_action_reinstall.png");
+ gtk_list_store_set(GTK_LIST_STORE(model),iter,STATUS_ICON_COLUMN,status_icon,-1);
gtk_list_store_set(GTK_LIST_STORE(model),iter,STATUS_COLUMN,status,-1);
gtk_list_store_set(GTK_LIST_STORE(model),iter,MARKED_COLUMN,TRUE,-1);
g_free(status);
+ gdk_pixbuf_unref(status_icon);
}
static int set_iter_for_downgrade(GtkTreeModel *model, GtkTreeIter *iter,
slapt_pkg_info_t *pkg)
{
gchar *status = g_strdup_printf("u%s",pkg->name);
- gtk_list_store_set(GTK_LIST_STORE(model),iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_downgrade.png"),-1);
+ GdkPixbuf *status_icon = create_pixbuf("pkg_action_downgrade.png");
+ gtk_list_store_set(GTK_LIST_STORE(model),iter,STATUS_ICON_COLUMN,status_icon,-1);
gtk_list_store_set(GTK_LIST_STORE(model),iter,STATUS_COLUMN,status,-1);
gtk_list_store_set(GTK_LIST_STORE(model),iter,MARKED_COLUMN,TRUE,-1);
g_free(status);
+ gdk_pixbuf_unref(status_icon);
}
static int set_iter_for_upgrade(GtkTreeModel *model, GtkTreeIter *iter,
slapt_pkg_info_t *pkg)
{
gchar *status = g_strdup_printf("u%s",pkg->name);
- gtk_list_store_set(GTK_LIST_STORE(model),iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_upgrade.png"),-1);
+ GdkPixbuf *status_icon = create_pixbuf("pkg_action_upgrade.png");
+ gtk_list_store_set(GTK_LIST_STORE(model),iter,STATUS_ICON_COLUMN,status_icon,-1);
gtk_list_store_set(GTK_LIST_STORE(model),iter,STATUS_COLUMN,status,-1);
gtk_list_store_set(GTK_LIST_STORE(model),iter,MARKED_COLUMN,TRUE,-1);
g_free(status);
+ gdk_pixbuf_unref(status_icon);
}
static int set_iter_for_remove(GtkTreeModel *model, GtkTreeIter *iter,
slapt_pkg_info_t *pkg)
{
gchar *status = g_strdup_printf("r%s",pkg->name);
- gtk_list_store_set(GTK_LIST_STORE(model),iter,STATUS_ICON_COLUMN,create_pixbuf("pkg_action_remove.png"),-1);
+ GdkPixbuf *status_icon = create_pixbuf("pkg_action_remove.png");
+ gtk_list_store_set(GTK_LIST_STORE(model),iter,STATUS_ICON_COLUMN,status_icon,-1);
gtk_list_store_set(GTK_LIST_STORE(model),iter,STATUS_COLUMN,status,-1);
gtk_list_store_set(GTK_LIST_STORE(model),iter,MARKED_COLUMN,TRUE,-1);
g_free(status);
+ gdk_pixbuf_unref(status_icon);
}