Mailinglist Archive: opensuse-commit (1187 mails)

< Previous Next >
commit zen-updater
  • From: root@xxxxxxx (h_root)
  • Date: Thu, 6 Apr 2006 13:59:08 +0200 (CEST)
  • Message-id: <20060406115908.237E68BE72@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package zen-updater
checked in at Thu Apr 6 13:59:08 CEST 2006.

--------
--- zen-updater/zen-updater.changes 2006-04-04 20:38:22.000000000 +0200
+++ zen-updater/zen-updater.changes 2006-04-06 00:43:47.000000000 +0200
@@ -1,0 +2,8 @@
+Thu Apr 6 00:43:07 CEST 2006 - maw@xxxxxxx
+
+- New source drop (r26747) which:
+- Gets rid of the Importance field in favour of Category
+- Sees if writes to the database were caused by the daemon going
+ to sleep before we ask for the update status.
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ zen-updater.spec ++++++
--- /var/tmp/diff_new_pack.DIDJjC/_old 2006-04-06 13:57:56.000000000 +0200
+++ /var/tmp/diff_new_pack.DIDJjC/_new 2006-04-06 13:57:56.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: 29
+Release: 30
License: LGPL
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %name-%version.tar.bz2
@@ -74,6 +74,11 @@
%{_mandir}/*/*

%changelog -n zen-updater
+* Thu Apr 06 2006 - maw@xxxxxxx
+- New source drop (r26747) which:
+- Gets rid of the Importance field in favour of Category
+- Sees if writes to the database were caused by the daemon going
+ to sleep before we ask for the update status.
* Tue Apr 04 2006 - maw@xxxxxxx
- New source drop (r26628) which:
- Presents the configure and update windows to the user if they are

++++++ zen-updater-7.1.0.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zen-updater-7.1.0/ChangeLog new/zen-updater-7.1.0/ChangeLog
--- old/zen-updater-7.1.0/ChangeLog 2006-04-03 22:07:31.000000000 +0200
+++ new/zen-updater-7.1.0/ChangeLog 2006-04-05 23:52:39.000000000 +0200
@@ -1,3 +1,15 @@
+2006-04-05 Chris Rivera <cmr@xxxxxxxxxx>
+
+ * src/IContent.cs:
+ * src/PackageContent.cs:
+ * src/BundleContent.cs:
+ * src/ResolvableContent.cs:
+
+ Use Category instead of Importance.
+
+ * src/ResolvableContent.cs: see if the writes to the database were caused
+ by the daemon going to sleep and don't check for updates in that case.
+
2006-03-31 Chris Rivera <cmr@xxxxxxxxxx>

* src/UpdaterWindow.cs:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zen-updater-7.1.0/po/zen-updater.pot new/zen-updater-7.1.0/po/zen-updater.pot
--- old/zen-updater-7.1.0/po/zen-updater.pot 2006-04-04 18:39:19.000000000 +0200
+++ new/zen-updater-7.1.0/po/zen-updater.pot 2006-04-05 23:53:28.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-04 12:39-0400\n"
+"POT-Creation-Date: 2006-04-05 17:53-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -51,7 +51,7 @@
msgid "_Remove Service"
msgstr ""

-#: src/ConfigureWindow.cs:104 src/TrayIcon.cs:266
+#: src/ConfigureWindow.cs:104 src/TrayIcon.cs:271
msgid "Refreshing services..."
msgstr ""

@@ -403,15 +403,15 @@
msgid "_Quit"
msgstr ""

-#: src/TrayIcon.cs:193
+#: src/TrayIcon.cs:198
msgid "There are software updates available"
msgstr ""

-#: src/TrayIcon.cs:194
+#: src/TrayIcon.cs:199
msgid "There are no software updates available"
msgstr ""

-#: src/TrayIcon.cs:329 src/TrayIcon.cs:334 src/ZenInstaller.cs:92
+#: src/TrayIcon.cs:334 src/TrayIcon.cs:339 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 old/zen-updater-7.1.0/src/BundleContent.cs new/zen-updater-7.1.0/src/BundleContent.cs
--- old/zen-updater-7.1.0/src/BundleContent.cs 2006-03-29 05:34:46.000000000 +0200
+++ new/zen-updater-7.1.0/src/BundleContent.cs 2006-04-05 21:41:15.000000000 +0200
@@ -58,8 +58,8 @@
get { return 0; }
}

- public override ImportanceType Importance {
- get { return ImportanceType.Recommended; }
+ public override CategoryType Category {
+ get { return CategoryType.Recommended; }
}

public override string Catalog {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zen-updater-7.1.0/src/DaemonHelper.cs new/zen-updater-7.1.0/src/DaemonHelper.cs
--- old/zen-updater-7.1.0/src/DaemonHelper.cs 2006-03-27 02:17:04.000000000 +0200
+++ new/zen-updater-7.1.0/src/DaemonHelper.cs 2006-04-05 21:26:55.000000000 +0200
@@ -86,6 +86,12 @@
return ((userprivs & testpriv) == testpriv);
}

+ public static bool IsSleeping {
+ get {
+ return RemotingUtility.IsDaemonSleeping;
+ }
+ }
+
public static int RefreshInterval {
get {
IPreferenceManager pm = (IPreferenceManager) RemotingUtility.Activate ("IPreferenceManager",
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zen-updater-7.1.0/src/IContent.cs new/zen-updater-7.1.0/src/IContent.cs
--- old/zen-updater-7.1.0/src/IContent.cs 2006-03-29 05:31:05.000000000 +0200
+++ new/zen-updater-7.1.0/src/IContent.cs 2006-04-05 21:44:28.000000000 +0200
@@ -31,7 +31,7 @@
public delegate void MediaChangeHandler (string label, MediaResponseHandler handler);
public delegate void MediaResponseHandler (bool abort);

- public enum ImportanceType {
+ public enum CategoryType {
Security,
Recommended,
Optional
@@ -44,24 +44,24 @@
public abstract string Catalog { get; }
public abstract string Summary { get; }
public abstract string Details { get; }
- public abstract ImportanceType Importance { get; }
+ public abstract CategoryType Category { get; }
public abstract string Type { get; }
public abstract int FileSize { get; }
public abstract object ActualContent { get; }

- protected ImportanceType GetImportanceType (string imp) {
+ protected CategoryType GetCategoryType (string imp) {
if (imp == null)
- return ImportanceType.Recommended;
+ return CategoryType.Recommended;

switch (imp.ToLower ()) {
case "security":
- return ImportanceType.Security;
+ return CategoryType.Security;
case "recommended":
- return ImportanceType.Recommended;
+ return CategoryType.Recommended;
case "optional":
- return ImportanceType.Optional;
+ return CategoryType.Optional;
default:
- return ImportanceType.Recommended;
+ return CategoryType.Recommended;
}
}

@@ -83,10 +83,10 @@

public int CompareTo (object o) {
ContentInfo other = (ContentInfo) o;
- if (other.Importance == Importance) {
+ if (other.Category == Category) {
return Name.CompareTo (((ContentInfo) o).Name);
- } else if (Importance == ImportanceType.Security ||
- Importance == ImportanceType.Recommended) {
+ } else if (Category == CategoryType.Security ||
+ Category == CategoryType.Recommended) {
return 1;
} else {
return -1;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore 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-03-29 05:33:03.000000000 +0200
+++ new/zen-updater-7.1.0/src/PackageContent.cs 2006-04-05 21:41:48.000000000 +0200
@@ -55,8 +55,8 @@
get { return info.FileSize; }
}

- public override ImportanceType Importance {
- get { return GetImportanceType (info.Importance); }
+ public override CategoryType Category {
+ get { return GetCategoryType (info.Category); }
}

public override string Catalog {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore 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-03-29 05:34:12.000000000 +0200
+++ new/zen-updater-7.1.0/src/ResolvableContent.cs 2006-04-05 21:43:28.000000000 +0200
@@ -55,8 +55,8 @@
get { return 0; }
}

- public override ImportanceType Importance {
- get { return GetImportanceType (info.Category); }
+ public override CategoryType Category {
+ get { return GetCategoryType (info.Category); }
}

public override string Catalog {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore 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-03-26 20:58:59.000000000 +0200
+++ new/zen-updater-7.1.0/src/TrayIcon.cs 2006-04-05 23:31:30.000000000 +0200
@@ -182,6 +182,11 @@
if (diff.TotalSeconds < 120)
return;

+ // wait to see if the daemon just went to sleep
+ System.Threading.Thread.Sleep (60000);
+ if (DaemonHelper.IsSleeping)
+ return;
+
lastCacheChange = now;
lock (updateLock) {
Monitor.Pulse (updateLock);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zen-updater-7.1.0/src/UpdaterWindow.cs new/zen-updater-7.1.0/src/UpdaterWindow.cs
--- old/zen-updater-7.1.0/src/UpdaterWindow.cs 2006-04-03 22:04:53.000000000 +0200
+++ new/zen-updater-7.1.0/src/UpdaterWindow.cs 2006-04-05 21:45:46.000000000 +0200
@@ -311,11 +311,11 @@
ci.Name, ci.Summary, ci.Catalog, ci.Type);

Pixbuf pb = null;
- switch (ci.Importance) {
- case ImportanceType.Security:
+ switch (ci.Category) {
+ case CategoryType.Security:
pb = securityImage.Pixbuf;
break;
- case ImportanceType.Optional:
+ case CategoryType.Optional:
pb = optionalImage.Pixbuf;
break;
}
@@ -503,8 +503,8 @@
model.GetIter (out iter, path);

ContentInfo ci = (ContentInfo) model.GetValue (iter, 3);
- textView.Buffer.Text = String.Format ("Update Version: {0}\nInstalled Version: {1}\nImportance: {2}\n\n{3}",
- ci.Version, ci.InstalledVersion, ci.Importance, ci.Details);
+ textView.Buffer.Text = String.Format ("Update Version: {0}\nInstalled Version: {1}\nCategory: {2}\n\n{3}",
+ ci.Version, ci.InstalledVersion, ci.Category, ci.Details);
}

private void GetSelectedContent (ContentCallback ch) {


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...


< Previous Next >