Hello community,
here is the log from the commit of package zen-updater
checked in at Thu Apr 13 17:16:36 CEST 2006.
--------
--- zen-updater/zen-updater.changes 2006-04-11 18:51:51.000000000 +0200
+++ STABLE/zen-updater/zen-updater.changes 2006-04-13 13:49:00.000000000 +0200
@@ -1,0 +2,20 @@
+Thu Apr 13 13:48:41 CEST 2006 - sbrabec@suse.cz
+
+- Updated cs.po.
+
+-------------------------------------------------------------------
+Thu Apr 13 12:16:26 CEST 2006 - sbrabec@suse.cz
+
+- Fixed translation conflicts and language names (153732#c12).
+
+-------------------------------------------------------------------
+Wed Apr 12 20:41:17 CEST 2006 - maw@suse.de
+
+- New source drop (r27024) which:
+- Doesn't escape package descriptions with GLib.Markup since it
+ isn't being displayed as markup
+- Handles the case where the user doesn't have view privs
+- Adds support for running yast2 inst_suse_register through
+ the service add dialog.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zen-updater.spec ++++++
--- /var/tmp/diff_new_pack.lVXTqf/_old 2006-04-13 17:15:44.000000000 +0200
+++ /var/tmp/diff_new_pack.lVXTqf/_new 2006-04-13 17:15:44.000000000 +0200
@@ -14,7 +14,7 @@
BuildRequires: glib-sharp2 gtk-sharp2 gtk2-devel log4net mono-basic mono-data-sqlite mono-devel perl-XML-Parser update-desktop-files zmd-devel
URL: http://novell.com/
Version: 7.1.0
-Release: 32
+Release: 35
License: LGPL
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %name-%version.tar.bz2
@@ -37,8 +37,13 @@
Chris Rivera
%prep
-%setup -q -a1
-sed -i 's/^ALL_LINGUAS="/&ar bg bn br bs ca cs cy da de el_GR es fi fr gl he hi hr hu id it ja ka km ko lo lt nb nl pa pl pt_BR pt ro ru sk sl_SI sr sv ta tr uk zh_CN zh zh_TW /' configure.in configure
+%setup -q
+cd po
+for i in *.po ; do if test $i != pt_BR.po -a $i != en_US.po ; then mv -v $i ${i/_??} ; fi ; done
+rm *.gmo
+cd ..
+tar -jxf %{S:1}
+sed -i "s/^\\(ALL_LINGUAS=\"\\)[^\"]*\"/\\1$( cd po ; echo *.po | sed 's/\.po//g' )\"/" configure.in configure
%patch0 -p0
%build
@@ -74,6 +79,17 @@
%{_mandir}/*/*
%changelog -n zen-updater
+* Thu Apr 13 2006 - sbrabec@suse.cz
+- Updated cs.po.
+* Thu Apr 13 2006 - sbrabec@suse.cz
+- Fixed translation conflicts and language names (153732#c12).
+* Wed Apr 12 2006 - maw@suse.de
+- New source drop (r27024) which:
+- Doesn't escape package descriptions with GLib.Markup since it
+ isn't being displayed as markup
+- Handles the case where the user doesn't have view privs
+- Adds support for running yast2 inst_suse_register through
+ the service add dialog.
* Tue Apr 11 2006 - maw@suse.de
- New source drop (r26962) which:
- Makes sure security updates are shown at the top of the update
++++++ zen-updater-7.1.0.tar.bz2 ++++++
++++ 1610 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zen-updater-7.1.0/ChangeLog new/zen-updater-7.1.0/ChangeLog
--- old/zen-updater-7.1.0/ChangeLog 2006-04-11 17:54:25.000000000 +0200
+++ new/zen-updater-7.1.0/ChangeLog 2006-04-12 18:57:58.000000000 +0200
@@ -1,3 +1,18 @@
+2006-04-12 Chris Rivera
+
+ * src/PackageContent.cs:
+ * src/ResolvableContent.cs:
+
+ Don't glib espace the package description since it
+ isn't displayed through markup.
+
+ * src/TrayIcon.cs: complain if the user is in zmd, but doesn't have view
+ privileges.
+
+ * src/ServiceAddWindow.cs: add a hack to allow the user to run the
+ SUSE product registration thingy if they don't have any services.
+ * src/ConfigureWindow.cs: run yast2 inst_suse_register here.
+
2006-04-11 Chris Rivera
* src/IContent.cs: make sure the comparer shows security updates first and
Binary files old/zen-updater-7.1.0/po/cs_CZ.gmo and new/zen-updater-7.1.0/po/cs_CZ.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zen-updater-7.1.0/po/cs_CZ.po new/zen-updater-7.1.0/po/cs_CZ.po
--- old/zen-updater-7.1.0/po/cs_CZ.po 2006-04-11 18:05:29.000000000 +0200
+++ new/zen-updater-7.1.0/po/cs_CZ.po 2006-04-12 20:13:33.000000000 +0200
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: zen-updater\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-11 12:05-0400\n"
+"POT-Creation-Date: 2006-04-12 14:13-0400\n"
"PO-Revision-Date: 2006-02-01 17:03+0100\n"
"Last-Translator: Jakub Friedl \n"
"Language-Team: \n"
@@ -63,79 +63,87 @@
msgid "Refreshing services..."
msgstr "Aktualizace služeb..."
-#: src/ConfigureWindow.cs:169
+#: src/ConfigureWindow.cs:174
#, fuzzy
msgid "Adding"
msgstr "Přid_at"
-#: src/ConfigureWindow.cs:181
+#: src/ConfigureWindow.cs:186
msgid "Unable to add service: "
msgstr "Nelze přidat službu: "
-#: src/ConfigureWindow.cs:194
+#: src/ConfigureWindow.cs:199
msgid "Unable to add service"
msgstr "Nelze přidat službu"
-#: src/ConfigureWindow.cs:276 src/ConfigureWindow.cs:309
+#: src/ConfigureWindow.cs:281 src/ConfigureWindow.cs:314
msgid "Failed to locate an su application."
msgstr ""
-#: src/ConfigureWindow.cs:299
+#: src/ConfigureWindow.cs:304
#, fuzzy
msgid "Failed to remove service."
msgstr "Nelze přidat službu"
-#: src/ConfigureWindow.cs:346
+#: src/ConfigureWindow.cs:351
#, fuzzy
msgid "Failed to add service."
msgstr "Nelze přidat službu"
-#: src/ConfigureWindow.cs:406
+#: src/ConfigureWindow.cs:389
+msgid "/sbin/yast2 does not exist"
+msgstr ""
+
+#: src/ConfigureWindow.cs:397
+msgid "Failed to locate su application"
+msgstr ""
+
+#: src/ConfigureWindow.cs:445
msgid "Start the software updater on login"
msgstr ""
-#: src/ConfigureWindow.cs:418
+#: src/ConfigureWindow.cs:457
#, fuzzy
msgid "Loading preferences..."
msgstr "Přidávání služby..."
-#: src/ConfigureWindow.cs:423
+#: src/ConfigureWindow.cs:462
msgid "Preference"
msgstr ""
-#: src/ConfigureWindow.cs:426
+#: src/ConfigureWindow.cs:465
msgid "Value"
msgstr ""
-#: src/ConfigureWindow.cs:456
+#: src/ConfigureWindow.cs:495
msgid "You do not have permission to edit these preferences."
msgstr ""
-#: src/ConfigureWindow.cs:475
+#: src/ConfigureWindow.cs:514
msgid "You must have superuser privileges to change preferences."
msgstr ""
-#: src/ConfigureWindow.cs:588
+#: src/ConfigureWindow.cs:627
msgid "Subscribe"
msgstr "Přihlásit"
-#: src/ConfigureWindow.cs:589
+#: src/ConfigureWindow.cs:628
msgid "Catalog"
msgstr "Katalog"
-#: src/ConfigureWindow.cs:671
+#: src/ConfigureWindow.cs:710
msgid "Configuration"
msgstr ""
-#: src/ConfigureWindow.cs:688
+#: src/ConfigureWindow.cs:727
msgid "Services"
msgstr "Služby"
-#: src/ConfigureWindow.cs:694
+#: src/ConfigureWindow.cs:733
msgid "Catalogs"
msgstr "Katalogy"
-#: src/ConfigureWindow.cs:697
+#: src/ConfigureWindow.cs:736
msgid "Preferences"
msgstr ""
@@ -156,7 +164,7 @@
msgid "_Apply"
msgstr "_Použít"
-#: src/ConfirmationWindow.cs:86 src/ServiceAddWindow.cs:72
+#: src/ConfirmationWindow.cs:86 src/ServiceAddWindow.cs:74
msgid "_Cancel"
msgstr "_Zrušit"
@@ -362,39 +370,39 @@
msgid "Transaction failed"
msgstr "Transakce selhala: "
-#: src/ServiceAddWindow.cs:59
+#: src/ServiceAddWindow.cs:61
msgid "Add Service"
msgstr "Přidat službu"
-#: src/ServiceAddWindow.cs:68
+#: src/ServiceAddWindow.cs:70
msgid "_Add"
msgstr "Přid_at"
-#: src/ServiceAddWindow.cs:86
+#: src/ServiceAddWindow.cs:87
#, fuzzy
msgid "Service URI:"
msgstr "Služby"
-#: src/ServiceAddWindow.cs:91
+#: src/ServiceAddWindow.cs:92
#, fuzzy
msgid "Registration Key:"
msgstr "Registrační klíč"
-#: src/ServiceAddWindow.cs:96
+#: src/ServiceAddWindow.cs:97
#, fuzzy
msgid "Service Name:"
msgstr "Služby"
-#: src/ServiceAddWindow.cs:100
+#: src/ServiceAddWindow.cs:101
#, fuzzy
msgid "Service Type:"
msgstr "Služby"
-#: src/ServiceAddWindow.cs:165
+#: src/ServiceAddWindow.cs:201
msgid " is an invalid service URI."
msgstr " je neplatné URI služby."
-#: src/ServiceAddWindow.cs:170
+#: src/ServiceAddWindow.cs:206
msgid "YUM services must have a name."
msgstr ""
@@ -447,7 +455,7 @@
msgid "There are no software updates available"
msgstr "Nejsou dostupné žádné aktualizace."
-#: src/TrayIcon.cs:334 src/TrayIcon.cs:339 src/ZenInstaller.cs:92
+#: src/TrayIcon.cs:340 src/TrayIcon.cs:345 src/ZenInstaller.cs:92
#: src/ZenInstaller.cs:95 src/ZenRemover.cs:91 src/ZenRemover.cs:94
#: src/ZenUpdater.cs:103 src/ZenUpdater.cs:106
msgid "ZMD does not appear to be running."
Binary files old/zen-updater-7.1.0/po/de_DE.gmo and new/zen-updater-7.1.0/po/de_DE.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zen-updater-7.1.0/po/de_DE.po new/zen-updater-7.1.0/po/de_DE.po
--- old/zen-updater-7.1.0/po/de_DE.po 2006-04-11 18:05:29.000000000 +0200
+++ new/zen-updater-7.1.0/po/de_DE.po 2006-04-12 20:13:33.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: 7.1.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-11 12:05-0400\n"
+"POT-Creation-Date: 2006-04-12 14:13-0400\n"
"PO-Revision-Date: 2006-03-03 17:29-0500\n"
"Last-Translator: Maher \n"
"Language-Team: team \n"
@@ -57,80 +57,88 @@
msgid "Refreshing services..."
msgstr "Refreshing services..."
-#: src/ConfigureWindow.cs:169
+#: src/ConfigureWindow.cs:174
msgid "Adding"
msgstr "Wird hinzugefügt"
-#: src/ConfigureWindow.cs:181
+#: src/ConfigureWindow.cs:186
msgid "Unable to add service: "
msgstr "Dienst kann nicht hinzugefügt werden: "
-#: src/ConfigureWindow.cs:194
+#: src/ConfigureWindow.cs:199
msgid "Unable to add service"
msgstr "Dienst kann nicht hinzugefügt werden"
-#: src/ConfigureWindow.cs:276 src/ConfigureWindow.cs:309
+#: src/ConfigureWindow.cs:281 src/ConfigureWindow.cs:314
msgid "Failed to locate an su application."
msgstr ""
-#: src/ConfigureWindow.cs:299
+#: src/ConfigureWindow.cs:304
#, fuzzy
msgid "Failed to remove service."
msgstr "Dienst kann nicht hinzugefügt werden"
-#: src/ConfigureWindow.cs:346
+#: src/ConfigureWindow.cs:351
#, fuzzy
msgid "Failed to add service."
msgstr "Dienst kann nicht hinzugefügt werden"
-#: src/ConfigureWindow.cs:406
+#: src/ConfigureWindow.cs:389
+msgid "/sbin/yast2 does not exist"
+msgstr ""
+
+#: src/ConfigureWindow.cs:397
+msgid "Failed to locate su application"
+msgstr ""
+
+#: src/ConfigureWindow.cs:445
msgid "Start the software updater on login"
msgstr ""
-#: src/ConfigureWindow.cs:418
+#: src/ConfigureWindow.cs:457
#, fuzzy
msgid "Loading preferences..."
msgstr "Resolving dependencies..."
-#: src/ConfigureWindow.cs:423
+#: src/ConfigureWindow.cs:462
msgid "Preference"
msgstr ""
-#: src/ConfigureWindow.cs:426
+#: src/ConfigureWindow.cs:465
msgid "Value"
msgstr ""
-#: src/ConfigureWindow.cs:456
+#: src/ConfigureWindow.cs:495
msgid "You do not have permission to edit these preferences."
msgstr ""
-#: src/ConfigureWindow.cs:475
+#: src/ConfigureWindow.cs:514
msgid "You must have superuser privileges to change preferences."
msgstr ""
-#: src/ConfigureWindow.cs:588
+#: src/ConfigureWindow.cs:627
msgid "Subscribe"
msgstr "Abonnieren"
-#: src/ConfigureWindow.cs:589
+#: src/ConfigureWindow.cs:628
msgid "Catalog"
msgstr "Katalog"
-#: src/ConfigureWindow.cs:671
+#: src/ConfigureWindow.cs:710
msgid "Configuration"
msgstr "Konfiguration"
-#: src/ConfigureWindow.cs:688
+#: src/ConfigureWindow.cs:727
#, fuzzy
msgid "Services"
msgstr "Dienst hinzufügen"
-#: src/ConfigureWindow.cs:694
+#: src/ConfigureWindow.cs:733
#, fuzzy
msgid "Catalogs"
msgstr "Katalog"
-#: src/ConfigureWindow.cs:697
+#: src/ConfigureWindow.cs:736
msgid "Preferences"
msgstr ""
@@ -150,7 +158,7 @@
msgid "_Apply"
msgstr "_Anwenden"
-#: src/ConfirmationWindow.cs:86 src/ServiceAddWindow.cs:72
+#: src/ConfirmationWindow.cs:86 src/ServiceAddWindow.cs:74
msgid "_Cancel"
msgstr "Abbre_chen"
@@ -356,36 +364,36 @@
msgid "Transaction failed"
msgstr "Fehler bei Transaktion: "
-#: src/ServiceAddWindow.cs:59
+#: src/ServiceAddWindow.cs:61
msgid "Add Service"
msgstr "Dienst hinzufügen"
-#: src/ServiceAddWindow.cs:68
+#: src/ServiceAddWindow.cs:70
msgid "_Add"
msgstr "_Hinzufügen"
-#: src/ServiceAddWindow.cs:86
+#: src/ServiceAddWindow.cs:87
msgid "Service URI:"
msgstr "Dienst-URI:"
-#: src/ServiceAddWindow.cs:91
+#: src/ServiceAddWindow.cs:92
msgid "Registration Key:"
msgstr "Registrierungsschlüssel"
-#: src/ServiceAddWindow.cs:96
+#: src/ServiceAddWindow.cs:97
#, fuzzy
msgid "Service Name:"
msgstr "Service-Typ:"
-#: src/ServiceAddWindow.cs:100
+#: src/ServiceAddWindow.cs:101
msgid "Service Type:"
msgstr "Service-Typ:"
-#: src/ServiceAddWindow.cs:165
+#: src/ServiceAddWindow.cs:201
msgid " is an invalid service URI."
msgstr " ist eine ungültige Dienst-URI."
-#: src/ServiceAddWindow.cs:170
+#: src/ServiceAddWindow.cs:206
msgid "YUM services must have a name."
msgstr ""
@@ -438,7 +446,7 @@
msgid "There are no software updates available"
msgstr "There are no updates available"
-#: src/TrayIcon.cs:334 src/TrayIcon.cs:339 src/ZenInstaller.cs:92
+#: src/TrayIcon.cs:340 src/TrayIcon.cs:345 src/ZenInstaller.cs:92
#: src/ZenInstaller.cs:95 src/ZenRemover.cs:91 src/ZenRemover.cs:94
#: src/ZenUpdater.cs:103 src/ZenUpdater.cs:106
msgid "ZMD does not appear to be running."
Binary files old/zen-updater-7.1.0/po/en_US.gmo and new/zen-updater-7.1.0/po/en_US.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zen-updater-7.1.0/po/en_US.po new/zen-updater-7.1.0/po/en_US.po
--- old/zen-updater-7.1.0/po/en_US.po 2006-04-11 18:05:29.000000000 +0200
+++ new/zen-updater-7.1.0/po/en_US.po 2006-04-12 20:13:33.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: 7.1.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-11 12:05-0400\n"
+"POT-Creation-Date: 2006-04-12 14:13-0400\n"
"PO-Revision-Date: 2006-03-03 17:29-0500\n"
"Last-Translator: Maher \n"
"Language-Team: team \n"
@@ -57,80 +57,88 @@
msgid "Refreshing services..."
msgstr "Refreshing services..."
-#: src/ConfigureWindow.cs:169
+#: src/ConfigureWindow.cs:174
msgid "Adding"
msgstr "Adding"
-#: src/ConfigureWindow.cs:181
+#: src/ConfigureWindow.cs:186
msgid "Unable to add service: "
msgstr "Unable to add service: "
-#: src/ConfigureWindow.cs:194
+#: src/ConfigureWindow.cs:199
msgid "Unable to add service"
msgstr "Unable to add service"
-#: src/ConfigureWindow.cs:276 src/ConfigureWindow.cs:309
+#: src/ConfigureWindow.cs:281 src/ConfigureWindow.cs:314
msgid "Failed to locate an su application."
msgstr ""
-#: src/ConfigureWindow.cs:299
+#: src/ConfigureWindow.cs:304
#, fuzzy
msgid "Failed to remove service."
msgstr "Unable to add service"
-#: src/ConfigureWindow.cs:346
+#: src/ConfigureWindow.cs:351
#, fuzzy
msgid "Failed to add service."
msgstr "Unable to add service"
-#: src/ConfigureWindow.cs:406
+#: src/ConfigureWindow.cs:389
+msgid "/sbin/yast2 does not exist"
+msgstr ""
+
+#: src/ConfigureWindow.cs:397
+msgid "Failed to locate su application"
+msgstr ""
+
+#: src/ConfigureWindow.cs:445
msgid "Start the software updater on login"
msgstr ""
-#: src/ConfigureWindow.cs:418
+#: src/ConfigureWindow.cs:457
#, fuzzy
msgid "Loading preferences..."
msgstr "Resolving dependencies..."
-#: src/ConfigureWindow.cs:423
+#: src/ConfigureWindow.cs:462
msgid "Preference"
msgstr ""
-#: src/ConfigureWindow.cs:426
+#: src/ConfigureWindow.cs:465
msgid "Value"
msgstr ""
-#: src/ConfigureWindow.cs:456
+#: src/ConfigureWindow.cs:495
msgid "You do not have permission to edit these preferences."
msgstr ""
-#: src/ConfigureWindow.cs:475
+#: src/ConfigureWindow.cs:514
msgid "You must have superuser privileges to change preferences."
msgstr ""
-#: src/ConfigureWindow.cs:588
+#: src/ConfigureWindow.cs:627
msgid "Subscribe"
msgstr "Subscribe"
-#: src/ConfigureWindow.cs:589
+#: src/ConfigureWindow.cs:628
msgid "Catalog"
msgstr "Catalog"
-#: src/ConfigureWindow.cs:671
+#: src/ConfigureWindow.cs:710
msgid "Configuration"
msgstr "Configuration"
-#: src/ConfigureWindow.cs:688
+#: src/ConfigureWindow.cs:727
#, fuzzy
msgid "Services"
msgstr "Add Service"
-#: src/ConfigureWindow.cs:694
+#: src/ConfigureWindow.cs:733
#, fuzzy
msgid "Catalogs"
msgstr "Catalog"
-#: src/ConfigureWindow.cs:697
+#: src/ConfigureWindow.cs:736
msgid "Preferences"
msgstr ""
@@ -150,7 +158,7 @@
msgid "_Apply"
msgstr "_Apply"
-#: src/ConfirmationWindow.cs:86 src/ServiceAddWindow.cs:72
+#: src/ConfirmationWindow.cs:86 src/ServiceAddWindow.cs:74
msgid "_Cancel"
msgstr "_Cancel"
@@ -354,36 +362,36 @@
msgid "Transaction failed"
msgstr "Transaction failed: "
-#: src/ServiceAddWindow.cs:59
+#: src/ServiceAddWindow.cs:61
msgid "Add Service"
msgstr "Add Service"
-#: src/ServiceAddWindow.cs:68
+#: src/ServiceAddWindow.cs:70
msgid "_Add"
msgstr "_Add"
-#: src/ServiceAddWindow.cs:86
+#: src/ServiceAddWindow.cs:87
msgid "Service URI:"
msgstr "Service URI:"
-#: src/ServiceAddWindow.cs:91
+#: src/ServiceAddWindow.cs:92
msgid "Registration Key:"
msgstr "Registration Key:"
-#: src/ServiceAddWindow.cs:96
+#: src/ServiceAddWindow.cs:97
#, fuzzy
msgid "Service Name:"
msgstr "Service Type:"
-#: src/ServiceAddWindow.cs:100
+#: src/ServiceAddWindow.cs:101
msgid "Service Type:"
msgstr "Service Type:"
-#: src/ServiceAddWindow.cs:165
+#: src/ServiceAddWindow.cs:201
msgid " is an invalid service URI."
msgstr " is an invalid service URI."
-#: src/ServiceAddWindow.cs:170
+#: src/ServiceAddWindow.cs:206
msgid "YUM services must have a name."
msgstr ""
@@ -436,7 +444,7 @@
msgid "There are no software updates available"
msgstr "There are no updates available"
-#: src/TrayIcon.cs:334 src/TrayIcon.cs:339 src/ZenInstaller.cs:92
+#: src/TrayIcon.cs:340 src/TrayIcon.cs:345 src/ZenInstaller.cs:92
#: src/ZenInstaller.cs:95 src/ZenRemover.cs:91 src/ZenRemover.cs:94
#: src/ZenUpdater.cs:103 src/ZenUpdater.cs:106
msgid "ZMD does not appear to be running."
Binary files old/zen-updater-7.1.0/po/es_ES.gmo and new/zen-updater-7.1.0/po/es_ES.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zen-updater-7.1.0/po/es_ES.po new/zen-updater-7.1.0/po/es_ES.po
--- old/zen-updater-7.1.0/po/es_ES.po 2006-04-11 18:05:29.000000000 +0200
+++ new/zen-updater-7.1.0/po/es_ES.po 2006-04-12 20:13:33.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: 7.1.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-11 12:05-0400\n"
+"POT-Creation-Date: 2006-04-12 14:13-0400\n"
"PO-Revision-Date: 2006-03-03 17:29-0500\n"
"Last-Translator: Maher \n"
"Language-Team: team \n"
@@ -57,80 +57,88 @@
msgid "Refreshing services..."
msgstr "Refreshing services..."
-#: src/ConfigureWindow.cs:169
+#: src/ConfigureWindow.cs:174
msgid "Adding"
msgstr "Añadiendo"
-#: src/ConfigureWindow.cs:181
+#: src/ConfigureWindow.cs:186
msgid "Unable to add service: "
msgstr "No es posible añadir el servicio: "
-#: src/ConfigureWindow.cs:194
+#: src/ConfigureWindow.cs:199
msgid "Unable to add service"
msgstr "No es posible añadir el servicio"
-#: src/ConfigureWindow.cs:276 src/ConfigureWindow.cs:309
+#: src/ConfigureWindow.cs:281 src/ConfigureWindow.cs:314
msgid "Failed to locate an su application."
msgstr ""
-#: src/ConfigureWindow.cs:299
+#: src/ConfigureWindow.cs:304
#, fuzzy
msgid "Failed to remove service."
msgstr "No es posible añadir el servicio"
-#: src/ConfigureWindow.cs:346
+#: src/ConfigureWindow.cs:351
#, fuzzy
msgid "Failed to add service."
msgstr "No es posible añadir el servicio"
-#: src/ConfigureWindow.cs:406
+#: src/ConfigureWindow.cs:389
+msgid "/sbin/yast2 does not exist"
+msgstr ""
+
+#: src/ConfigureWindow.cs:397
+msgid "Failed to locate su application"
+msgstr ""
+
+#: src/ConfigureWindow.cs:445
msgid "Start the software updater on login"
msgstr ""
-#: src/ConfigureWindow.cs:418
+#: src/ConfigureWindow.cs:457
#, fuzzy
msgid "Loading preferences..."
msgstr "Resolving dependencies..."
-#: src/ConfigureWindow.cs:423
+#: src/ConfigureWindow.cs:462
msgid "Preference"
msgstr ""
-#: src/ConfigureWindow.cs:426
+#: src/ConfigureWindow.cs:465
msgid "Value"
msgstr ""
-#: src/ConfigureWindow.cs:456
+#: src/ConfigureWindow.cs:495
msgid "You do not have permission to edit these preferences."
msgstr ""
-#: src/ConfigureWindow.cs:475
+#: src/ConfigureWindow.cs:514
msgid "You must have superuser privileges to change preferences."
msgstr ""
-#: src/ConfigureWindow.cs:588
+#: src/ConfigureWindow.cs:627
msgid "Subscribe"
msgstr "Suscribir"
-#: src/ConfigureWindow.cs:589
+#: src/ConfigureWindow.cs:628
msgid "Catalog"
msgstr "Catálogo"
-#: src/ConfigureWindow.cs:671
+#: src/ConfigureWindow.cs:710
msgid "Configuration"
msgstr "Configuración"
-#: src/ConfigureWindow.cs:688
+#: src/ConfigureWindow.cs:727
#, fuzzy
msgid "Services"
msgstr "Añadir servicio"
-#: src/ConfigureWindow.cs:694
+#: src/ConfigureWindow.cs:733
#, fuzzy
msgid "Catalogs"
msgstr "Catálogo"
-#: src/ConfigureWindow.cs:697
+#: src/ConfigureWindow.cs:736
msgid "Preferences"
msgstr ""
@@ -150,7 +158,7 @@
msgid "_Apply"
msgstr "_Aplicar"
-#: src/ConfirmationWindow.cs:86 src/ServiceAddWindow.cs:72
+#: src/ConfirmationWindow.cs:86 src/ServiceAddWindow.cs:74
msgid "_Cancel"
msgstr "_Cancelar"
@@ -356,36 +364,36 @@
msgid "Transaction failed"
msgstr "Error en la transacción: "
-#: src/ServiceAddWindow.cs:59
+#: src/ServiceAddWindow.cs:61
msgid "Add Service"
msgstr "Añadir servicio"
-#: src/ServiceAddWindow.cs:68
+#: src/ServiceAddWindow.cs:70
msgid "_Add"
msgstr "_Añadir"
-#: src/ServiceAddWindow.cs:86
+#: src/ServiceAddWindow.cs:87
msgid "Service URI:"
msgstr "URI de servicio:"
-#: src/ServiceAddWindow.cs:91
+#: src/ServiceAddWindow.cs:92
msgid "Registration Key:"
msgstr "Clave de registro"
-#: src/ServiceAddWindow.cs:96
+#: src/ServiceAddWindow.cs:97
#, fuzzy
msgid "Service Name:"
msgstr "Tipo de servicio:"
-#: src/ServiceAddWindow.cs:100
+#: src/ServiceAddWindow.cs:101
msgid "Service Type:"
msgstr "Tipo de servicio:"
-#: src/ServiceAddWindow.cs:165
+#: src/ServiceAddWindow.cs:201
msgid " is an invalid service URI."
msgstr " es un URI de servicio no válido."
-#: src/ServiceAddWindow.cs:170
+#: src/ServiceAddWindow.cs:206
msgid "YUM services must have a name."
msgstr ""
@@ -438,7 +446,7 @@
msgid "There are no software updates available"
msgstr "There are no updates available"
-#: src/TrayIcon.cs:334 src/TrayIcon.cs:339 src/ZenInstaller.cs:92
+#: src/TrayIcon.cs:340 src/TrayIcon.cs:345 src/ZenInstaller.cs:92
#: src/ZenInstaller.cs:95 src/ZenRemover.cs:91 src/ZenRemover.cs:94
#: src/ZenUpdater.cs:103 src/ZenUpdater.cs:106
msgid "ZMD does not appear to be running."
Binary files old/zen-updater-7.1.0/po/fr_FR.gmo and new/zen-updater-7.1.0/po/fr_FR.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zen-updater-7.1.0/po/fr_FR.po new/zen-updater-7.1.0/po/fr_FR.po
--- old/zen-updater-7.1.0/po/fr_FR.po 2006-04-11 18:05:29.000000000 +0200
+++ new/zen-updater-7.1.0/po/fr_FR.po 2006-04-12 20:13:33.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: 7.1.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-11 12:05-0400\n"
+"POT-Creation-Date: 2006-04-12 14:13-0400\n"
"PO-Revision-Date: 2006-03-03 17:29-0500\n"
"Last-Translator: Maher \n"
"Language-Team: team \n"
@@ -57,80 +57,88 @@
msgid "Refreshing services..."
msgstr "Refreshing services..."
-#: src/ConfigureWindow.cs:169
+#: src/ConfigureWindow.cs:174
msgid "Adding"
msgstr "Ajout"
-#: src/ConfigureWindow.cs:181
+#: src/ConfigureWindow.cs:186
msgid "Unable to add service: "
msgstr "Impossible d'ajouter le service : "
-#: src/ConfigureWindow.cs:194
+#: src/ConfigureWindow.cs:199
msgid "Unable to add service"
msgstr "Impossible d'ajouter le service"
-#: src/ConfigureWindow.cs:276 src/ConfigureWindow.cs:309
+#: src/ConfigureWindow.cs:281 src/ConfigureWindow.cs:314
msgid "Failed to locate an su application."
msgstr ""
-#: src/ConfigureWindow.cs:299
+#: src/ConfigureWindow.cs:304
#, fuzzy
msgid "Failed to remove service."
msgstr "Impossible d'ajouter le service"
-#: src/ConfigureWindow.cs:346
+#: src/ConfigureWindow.cs:351
#, fuzzy
msgid "Failed to add service."
msgstr "Impossible d'ajouter le service"
-#: src/ConfigureWindow.cs:406
+#: src/ConfigureWindow.cs:389
+msgid "/sbin/yast2 does not exist"
+msgstr ""
+
+#: src/ConfigureWindow.cs:397
+msgid "Failed to locate su application"
+msgstr ""
+
+#: src/ConfigureWindow.cs:445
msgid "Start the software updater on login"
msgstr ""
-#: src/ConfigureWindow.cs:418
+#: src/ConfigureWindow.cs:457
#, fuzzy
msgid "Loading preferences..."
msgstr "Resolving dependencies..."
-#: src/ConfigureWindow.cs:423
+#: src/ConfigureWindow.cs:462
msgid "Preference"
msgstr ""
-#: src/ConfigureWindow.cs:426
+#: src/ConfigureWindow.cs:465
msgid "Value"
msgstr ""
-#: src/ConfigureWindow.cs:456
+#: src/ConfigureWindow.cs:495
msgid "You do not have permission to edit these preferences."
msgstr ""
-#: src/ConfigureWindow.cs:475
+#: src/ConfigureWindow.cs:514
msgid "You must have superuser privileges to change preferences."
msgstr ""
-#: src/ConfigureWindow.cs:588
+#: src/ConfigureWindow.cs:627
msgid "Subscribe"
msgstr "S'abonner"
-#: src/ConfigureWindow.cs:589
+#: src/ConfigureWindow.cs:628
msgid "Catalog"
msgstr "Catalogue"
-#: src/ConfigureWindow.cs:671
+#: src/ConfigureWindow.cs:710
msgid "Configuration"
msgstr "Configuration"
-#: src/ConfigureWindow.cs:688
+#: src/ConfigureWindow.cs:727
#, fuzzy
msgid "Services"
msgstr "Ajouter un service"
-#: src/ConfigureWindow.cs:694
+#: src/ConfigureWindow.cs:733
#, fuzzy
msgid "Catalogs"
msgstr "Catalogue"
-#: src/ConfigureWindow.cs:697
+#: src/ConfigureWindow.cs:736
msgid "Preferences"
msgstr ""
@@ -150,7 +158,7 @@
msgid "_Apply"
msgstr "_Appliquer"
-#: src/ConfirmationWindow.cs:86 src/ServiceAddWindow.cs:72
+#: src/ConfirmationWindow.cs:86 src/ServiceAddWindow.cs:74
msgid "_Cancel"
msgstr "_Annuler"
@@ -354,36 +362,36 @@
msgid "Transaction failed"
msgstr "Échec de la transaction : "
-#: src/ServiceAddWindow.cs:59
+#: src/ServiceAddWindow.cs:61
msgid "Add Service"
msgstr "Ajouter un service"
-#: src/ServiceAddWindow.cs:68
+#: src/ServiceAddWindow.cs:70
msgid "_Add"
msgstr "_Ajouter"
-#: src/ServiceAddWindow.cs:86
+#: src/ServiceAddWindow.cs:87
msgid "Service URI:"
msgstr "URI du service :"
-#: src/ServiceAddWindow.cs:91
+#: src/ServiceAddWindow.cs:92
msgid "Registration Key:"
msgstr "Clé d'enregistrement"
-#: src/ServiceAddWindow.cs:96
+#: src/ServiceAddWindow.cs:97
#, fuzzy
msgid "Service Name:"
msgstr "Type de service :"
-#: src/ServiceAddWindow.cs:100
+#: src/ServiceAddWindow.cs:101
msgid "Service Type:"
msgstr "Type de service :"
-#: src/ServiceAddWindow.cs:165
+#: src/ServiceAddWindow.cs:201
msgid " is an invalid service URI."
msgstr " est une URI de service non valide."
-#: src/ServiceAddWindow.cs:170
+#: src/ServiceAddWindow.cs:206
msgid "YUM services must have a name."
msgstr ""
@@ -436,7 +444,7 @@
msgid "There are no software updates available"
msgstr "There are no updates available"
-#: src/TrayIcon.cs:334 src/TrayIcon.cs:339 src/ZenInstaller.cs:92
+#: src/TrayIcon.cs:340 src/TrayIcon.cs:345 src/ZenInstaller.cs:92
#: src/ZenInstaller.cs:95 src/ZenRemover.cs:91 src/ZenRemover.cs:94
#: src/ZenUpdater.cs:103 src/ZenUpdater.cs:106
msgid "ZMD does not appear to be running."
Binary files old/zen-updater-7.1.0/po/pt_BR.gmo and new/zen-updater-7.1.0/po/pt_BR.gmo differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zen-updater-7.1.0/po/pt_BR.po new/zen-updater-7.1.0/po/pt_BR.po
--- old/zen-updater-7.1.0/po/pt_BR.po 2006-04-11 18:05:29.000000000 +0200
+++ new/zen-updater-7.1.0/po/pt_BR.po 2006-04-12 20:13:33.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version:7.1.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-11 12:05-0400\n"
+"POT-Creation-Date: 2006-04-12 14:13-0400\n"
"PO-Revision-Date: 2006-03-03 17:29-0500\n"
"Last-Translator: Maher \n"
"Language-Team: team \n"
@@ -57,80 +57,88 @@
msgid "Refreshing services..."
msgstr "Refreshing services..."
-#: src/ConfigureWindow.cs:169
+#: src/ConfigureWindow.cs:174
msgid "Adding"
msgstr "Adicionando"
-#: src/ConfigureWindow.cs:181
+#: src/ConfigureWindow.cs:186
msgid "Unable to add service: "
msgstr "Não é possível adicionar o serviço: "
-#: src/ConfigureWindow.cs:194
+#: src/ConfigureWindow.cs:199
msgid "Unable to add service"
msgstr "Não é possível adicionar o serviço"
-#: src/ConfigureWindow.cs:276 src/ConfigureWindow.cs:309
+#: src/ConfigureWindow.cs:281 src/ConfigureWindow.cs:314
msgid "Failed to locate an su application."
msgstr ""
-#: src/ConfigureWindow.cs:299
+#: src/ConfigureWindow.cs:304
#, fuzzy
msgid "Failed to remove service."
msgstr "Não é possível adicionar o serviço"
-#: src/ConfigureWindow.cs:346
+#: src/ConfigureWindow.cs:351
#, fuzzy
msgid "Failed to add service."
msgstr "Não é possível adicionar o serviço"
-#: src/ConfigureWindow.cs:406
+#: src/ConfigureWindow.cs:389
+msgid "/sbin/yast2 does not exist"
+msgstr ""
+
+#: src/ConfigureWindow.cs:397
+msgid "Failed to locate su application"
+msgstr ""
+
+#: src/ConfigureWindow.cs:445
msgid "Start the software updater on login"
msgstr ""
-#: src/ConfigureWindow.cs:418
+#: src/ConfigureWindow.cs:457
#, fuzzy
msgid "Loading preferences..."
msgstr "Resolving dependencies..."
-#: src/ConfigureWindow.cs:423
+#: src/ConfigureWindow.cs:462
msgid "Preference"
msgstr ""
-#: src/ConfigureWindow.cs:426
+#: src/ConfigureWindow.cs:465
msgid "Value"
msgstr ""
-#: src/ConfigureWindow.cs:456
+#: src/ConfigureWindow.cs:495
msgid "You do not have permission to edit these preferences."
msgstr ""
-#: src/ConfigureWindow.cs:475
+#: src/ConfigureWindow.cs:514
msgid "You must have superuser privileges to change preferences."
msgstr ""
-#: src/ConfigureWindow.cs:588
+#: src/ConfigureWindow.cs:627
msgid "Subscribe"
msgstr "Inscrever"
-#: src/ConfigureWindow.cs:589
+#: src/ConfigureWindow.cs:628
msgid "Catalog"
msgstr "Catálogo"
-#: src/ConfigureWindow.cs:671
+#: src/ConfigureWindow.cs:710
msgid "Configuration"
msgstr "Configuração"
-#: src/ConfigureWindow.cs:688
+#: src/ConfigureWindow.cs:727
#, fuzzy
msgid "Services"
msgstr "Adicionar Serviço"
-#: src/ConfigureWindow.cs:694
+#: src/ConfigureWindow.cs:733
#, fuzzy
msgid "Catalogs"
msgstr "Catálogo"
-#: src/ConfigureWindow.cs:697
+#: src/ConfigureWindow.cs:736
msgid "Preferences"
msgstr ""
@@ -150,7 +158,7 @@
msgid "_Apply"
msgstr "_Aplicar"
-#: src/ConfirmationWindow.cs:86 src/ServiceAddWindow.cs:72
+#: src/ConfirmationWindow.cs:86 src/ServiceAddWindow.cs:74
msgid "_Cancel"
msgstr "_Cancelar"
@@ -355,36 +363,36 @@
msgid "Transaction failed"
msgstr "Falha na transação: "
-#: src/ServiceAddWindow.cs:59
+#: src/ServiceAddWindow.cs:61
msgid "Add Service"
msgstr "Adicionar Serviço"
-#: src/ServiceAddWindow.cs:68
+#: src/ServiceAddWindow.cs:70
msgid "_Add"
msgstr "_Adicionar"
-#: src/ServiceAddWindow.cs:86
+#: src/ServiceAddWindow.cs:87
msgid "Service URI:"
msgstr "URI do Serviço:"
-#: src/ServiceAddWindow.cs:91
+#: src/ServiceAddWindow.cs:92
msgid "Registration Key:"
msgstr "Chave de Registro:"
-#: src/ServiceAddWindow.cs:96
+#: src/ServiceAddWindow.cs:97
#, fuzzy
msgid "Service Name:"
msgstr "Tipo do Serviço:"
-#: src/ServiceAddWindow.cs:100
+#: src/ServiceAddWindow.cs:101
msgid "Service Type:"
msgstr "Tipo do Serviço:"
-#: src/ServiceAddWindow.cs:165
+#: src/ServiceAddWindow.cs:201
msgid " is an invalid service URI."
msgstr " é um URI de serviço inválido."
-#: src/ServiceAddWindow.cs:170
+#: src/ServiceAddWindow.cs:206
msgid "YUM services must have a name."
msgstr ""
@@ -437,7 +445,7 @@
msgid "There are no software updates available"
msgstr "There are no updates available"
-#: src/TrayIcon.cs:334 src/TrayIcon.cs:339 src/ZenInstaller.cs:92
+#: src/TrayIcon.cs:340 src/TrayIcon.cs:345 src/ZenInstaller.cs:92
#: src/ZenInstaller.cs:95 src/ZenRemover.cs:91 src/ZenRemover.cs:94
#: src/ZenUpdater.cs:103 src/ZenUpdater.cs:106
msgid "ZMD does not appear to be running."
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zen-updater-7.1.0/src/ConfigureWindow.cs new/zen-updater-7.1.0/src/ConfigureWindow.cs
--- old/zen-updater-7.1.0/src/ConfigureWindow.cs 2006-04-11 17:36:28.000000000 +0200
+++ new/zen-updater-7.1.0/src/ConfigureWindow.cs 2006-04-12 18:17:24.000000000 +0200
@@ -114,7 +114,7 @@
LoadServices ();
if (ServiceRefreshed != null)
- ServiceRefreshed (this, new EventArgs ());
+ ServiceRefreshed (this, EventArgs.Empty);
addButton.Sensitive = true;
refreshing = false;
@@ -148,6 +148,11 @@
}
private void OnServiceEntered (ServiceType stype, string uri, string key, string name) {
+ if (stype == null) {
+ ThreadPool.QueueUserWorkItem (new WaitCallback (RunSUSERegister));
+ return;
+ }
+
if (addingService) {
return;
} else {
@@ -199,7 +204,7 @@
private void OnAddClicked (object sender, EventArgs e) {
ServiceAddWindow.Instance.ServiceEntered += new ServiceEnteredHandler (OnServiceEntered);
- ServiceAddWindow.Instance.DisplayAll ();
+ ServiceAddWindow.Instance.DisplayAll (window);
}
private void OnRemoveClicked (object sender, EventArgs e) {
@@ -246,10 +251,10 @@
} while (model.IterNext (ref iter));
if (ServiceRemoved != null)
- ServiceRemoved (this, new EventArgs ());
+ ServiceRemoved (this, EventArgs.Empty);
if (RemovedAllServices != null && !model.GetIterFirst (out iter))
- RemovedAllServices (this, new EventArgs ());
+ RemovedAllServices (this, EventArgs.Empty);
}
private void OnServiceAdded (bool success, string msg) {
@@ -260,7 +265,7 @@
if (success) {
RefreshServices ();
if (ServiceAdded != null)
- ServiceAdded (this, new EventArgs ());
+ ServiceAdded (this, EventArgs.Empty);
} else {
Gtk.Application.Invoke (delegate {
Util.Error (window, msg);
@@ -377,6 +382,40 @@
}
}
}
+
+ private void RunSUSERegister (object dummy) {
+ if (!File.Exists ("/sbin/yast2")) {
+ Gtk.Application.Invoke (delegate {
+ Util.Error (window, Catalog.GetString ("/sbin/yast2 does not exist"));
+ });
+ return;
+ }
+
+ string suapp = Util.GetSUApp ();
+ if (suapp == null) {
+ Gtk.Application.Invoke (delegate {
+ Util.Error (window, Catalog.GetString ("Failed to locate su application"));
+ });
+ } else {
+ string app = suapp;
+ string args = "/sbin/yast2 inst_suse_register";
+
+ UserPrivs privs = DaemonHelper.Privileges;
+ if (DaemonHelper.HasPrivilege (privs, UserPrivs.Superuser)) {
+ app = "/sbin/yast2";
+ args = "inst_suse_register";
+ }
+
+ ProcessStartInfo pinfo = new ProcessStartInfo (app, args);
+ pinfo.UseShellExecute = false;
+ pinfo.RedirectStandardOutput = true;
+ Process proc = Process.Start (pinfo);
+ proc.WaitForExit ();
+
+ if (ServiceAdded != null)
+ ServiceAdded (this, EventArgs.Empty);
+ }
+ }
}
public class PreferencePage : VBox {
@@ -702,7 +741,7 @@
private void OnServiceChange (object sender, EventArgs e) {
cp.LoadCatalogs ();
if (ServicesChanged != null)
- ServicesChanged (this, new EventArgs ());
+ ServicesChanged (this, EventArgs.Empty);
}
private void OnServiceRefresh (object sender, EventArgs e) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zen-updater-7.1.0/src/PackageContent.cs new/zen-updater-7.1.0/src/PackageContent.cs
--- old/zen-updater-7.1.0/src/PackageContent.cs 2006-04-10 16:43:35.000000000 +0200
+++ new/zen-updater-7.1.0/src/PackageContent.cs 2006-04-12 18:39:37.000000000 +0200
@@ -73,7 +73,7 @@
}
public override string Details {
- get { return GLib.Markup.EscapeText (info.Description); }
+ get { return info.Description; }
}
public override string Type {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zen-updater-7.1.0/src/ResolvableContent.cs new/zen-updater-7.1.0/src/ResolvableContent.cs
--- old/zen-updater-7.1.0/src/ResolvableContent.cs 2006-04-10 16:43:47.000000000 +0200
+++ new/zen-updater-7.1.0/src/ResolvableContent.cs 2006-04-12 18:39:32.000000000 +0200
@@ -73,7 +73,7 @@
public override string Details {
get {
- return GLib.Markup.EscapeText (String.Format ("Status: {0}\n{1}", info.Status, info.Description));
+ return String.Format ("Status: {0}\n{1}", info.Status, info.Description);
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zen-updater-7.1.0/src/ServiceAddWindow.cs new/zen-updater-7.1.0/src/ServiceAddWindow.cs
--- old/zen-updater-7.1.0/src/ServiceAddWindow.cs 2006-04-10 15:05:45.000000000 +0200
+++ new/zen-updater-7.1.0/src/ServiceAddWindow.cs 2006-04-12 18:29:34.000000000 +0200
@@ -19,6 +19,7 @@
*/
using System;
+using System.IO;
using Gtk;
using Mono.Unix;
using Novell.Zenworks.Zmd.Public;
@@ -28,6 +29,7 @@
public delegate void ServiceEnteredHandler (ServiceType stype, string uri, string key, string name);
public class ServiceAddWindow : Window {
+ private const string suseRegisterText = "SUSE Product Registration";
private static ServiceAddWindow instance;
private Entry serviceEntry;
private Entry keyEntry;
@@ -70,7 +72,6 @@
Button cancelButton = Util.CreateImageButton (Stock.Cancel,
Catalog.GetString ("_Cancel"));
-
cancelButton.Clicked += delegate (object sender, EventArgs e) {
Hide ();
};
@@ -100,13 +101,7 @@
typeLabel = new Label (Catalog.GetString ("Service Type:"));
typeLabel.SetAlignment (0, 0.5f);
- serviceTypes = DaemonHelper.ServiceTypes;
- for (int i = 0; i < serviceTypes.Length; i++) {
- combo.AppendText (serviceTypes[i].Name);
- if (serviceTypes[i].Name == "ZENworks")
- combo.Active = i;
- }
-
+ LoadServiceTypes ();
combo.Changed += new EventHandler (OnComboChanged);
Table table = new Table (4, 2, false);
@@ -127,18 +122,51 @@
Add (vbox);
}
- public void DisplayAll () {
+ public void DisplayAll (Window parent) {
+ WindowPosition = WindowPosition.CenterOnParent;
+ TransientFor = parent;
ShowAll ();
OnComboChanged (combo, EventArgs.Empty);
+ Present ();
+ }
+
+ private void LoadServiceTypes () {
+ int i;
+ serviceTypes = DaemonHelper.ServiceTypes;
+ for (i = 0; i < serviceTypes.Length; i++) {
+ combo.AppendText (serviceTypes[i].Name);
+ if (serviceTypes[i].Name == "YUM")
+ combo.Active = i;
+ }
+
+ if (File.Exists ("/usr/share/YaST2/clients/inst_suse_register.ycp") &&
+ DaemonHelper.Services.Length == 0) {
+ combo.AppendText (suseRegisterText);
+ combo.Active = i;
+ }
}
private void OnComboChanged (object sender, EventArgs e) {
ComboBox cb = sender as ComboBox;
-
if (cb == null)
return;
- if (serviceTypes[cb.Active].Name == "YUM") {
+ if (cb.ActiveText == suseRegisterText) {
+ keyEntry.Hide ();
+ keyLabel.Hide ();
+ yumEntry.Hide ();
+ yumLabel.Hide ();
+ serviceLabel.Hide ();
+ serviceEntry.Hide ();
+ typeLabel.Hide ();
+ return;
+ } else {
+ typeLabel.Show ();
+ serviceLabel.Show ();
+ serviceEntry.Show ();
+ }
+
+ if (cb.ActiveText == "YUM") {
yumEntry.Show ();
yumLabel.Show ();
} else {
@@ -146,8 +174,9 @@
yumLabel.Hide ();
}
- if (serviceTypes[cb.Active].Name == "Mount" ||
- serviceTypes[cb.Active].Name == "YUM") {
+ if (cb.ActiveText == "Mount" ||
+ cb.ActiveText == "YUM" ||
+ cb.ActiveText == "ZYPP") {
keyEntry.Hide ();
keyLabel.Hide ();
} else {
@@ -157,6 +186,13 @@
}
private void OnAddClicked (object sender, EventArgs e) {
+ if (combo.ActiveText == suseRegisterText) {
+ if (ServiceEntered != null)
+ ServiceEntered (null, "", "", "");
+ Hide ();
+ return;
+ }
+
string uri = serviceEntry.Text;
string key = keyEntry.Text;
ServiceType stype = serviceTypes[combo.Active];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zen-updater-7.1.0/src/TrayIcon.cs new/zen-updater-7.1.0/src/TrayIcon.cs
--- old/zen-updater-7.1.0/src/TrayIcon.cs 2006-04-10 15:05:45.000000000 +0200
+++ new/zen-updater-7.1.0/src/TrayIcon.cs 2006-04-12 16:46:10.000000000 +0200
@@ -296,26 +296,22 @@
}
private void CheckUpdatesLoop () {
- int refint;
- bool firsttime = true;
+ /*
+ * This is to handle the case that a user in zmd exists
+ * but doesn't have view privileges. They can add themselves
+ * or we need to exit.
+ */
+ try {
+ UserPrivs privs = DaemonHelper.Privileges;
+ } catch (Exception e) {
+ Gtk.Application.Invoke (delegate {
+ Util.AskToAddUser (this, false);
+ });
+ return;
+ }
try {
do {
- refint = 1000 * DaemonHelper.RefreshInterval;
- if (!firsttime) {
- lock (updateLock) {
- Monitor.Wait (updateLock, refint);
- }
-
- lock (refreshLock) {
- if (refreshing) {
- continue;
- }
- }
- } else {
- firsttime = false;
- }
-
while (DaemonHelper.IsRefreshing)
System.Threading.Thread.Sleep (3000);
@@ -328,6 +324,16 @@
SetUpdateStatus (false);
});
}
+
+ lock (updateLock) {
+ Monitor.Wait (updateLock, DaemonHelper.RefreshInterval * 1000);
+ }
+
+ lock (refreshLock) {
+ if (refreshing) {
+ continue;
+ }
+ }
} while (true);
} catch (SocketException se) {
Gtk.Application.Invoke (delegate {
++++++ zen-updater-po.tar.bz2 ++++++
++++ 6823 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...