Hello community,
here is the log from the commit of package backup-manager
checked in at Tue Nov 4 17:31:22 CET 2008.
--------
--- GNOME/backup-manager/backup-manager.changes 2008-10-24 21:19:43.000000000 +0200
+++ /mounts/work_src_done/STABLE/backup-manager/backup-manager.changes 2008-11-03 18:43:08.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Nov 3 12:41:20 CEST 2008 - crivera@suse.de
+
+- Move dbus service names to the opensuse namespace.
+- Provide better visual feedback in the backup applet.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ backup-manager.spec ++++++
--- /var/tmp/diff_new_pack.l24401/_old 2008-11-04 17:30:58.000000000 +0100
+++ /var/tmp/diff_new_pack.l24401/_new 2008-11-04 17:30:58.000000000 +0100
@@ -25,7 +25,7 @@
Requires: python >= 2.6 python-gtk python-setuptools rdiff-backup PolicyKit PolicyKit-gnome dbus-1 dbus-1-python libnotify
AutoReqProv: on
Version: 0.1.0
-Release: 9
+Release: 10
Summary: A simple backup application for GNOME
Source: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -64,9 +64,9 @@
%config %{_sysconfdir}/dbus-1/system.d/backup-manager.conf
%dir %{_datadir}/doc/packages/backup-manager
%doc %{_datadir}/doc/packages/backup-manager/LICENSES
-%config %{_datadir}/PolicyKit/policy/com.google.code.backupmanager.policy
+%config %{_datadir}/PolicyKit/policy/org.opensuse.backupmanager.policy
#%{_datadir}/hal/fdi/policy/20thirdparty/99-backup-manager.fdi
-%config %{_datadir}/dbus-1/system-services/com.google.code.BackupManager.service
+%config %{_datadir}/dbus-1/system-services/org.opensuse.BackupManager.service
%{_datadir}/locale/*/LC_MESSAGES/backup_manager.mo
%post
@@ -74,6 +74,9 @@
%postun
%changelog
+* Mon Nov 03 2008 crivera@suse.de
+- Move dbus service names to the opensuse namespace.
+- Provide better visual feedback in the backup applet.
* Fri Oct 24 2008 crivera@suse.de
- Fix a bug in the PolicyKit usage.
- Re-direct output of backup-manager when running from cron
++++++ backup-manager-0.1.0.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/backup-manager-0.1.0/backup_manager/applet.py new/backup-manager-0.1.0/backup_manager/applet.py
--- old/backup-manager-0.1.0/backup_manager/applet.py 2008-09-25 16:23:00.000000000 +0200
+++ new/backup-manager-0.1.0/backup_manager/applet.py 2008-11-03 18:29:49.000000000 +0100
@@ -3,11 +3,13 @@
import sys
import time
import subprocess
+import cairo
import gtk
import gtk.glade
import gobject
import dbus
import gettext
+import math
from gettext import gettext as _
from pkg_resources import resource_filename
from backup_manager.core import *
@@ -65,7 +67,6 @@
def __init__ (self):
gtk.StatusIcon.__init__ (self)
- self.set_from_stock (gtk.STOCK_HARDDISK)
self.set_tooltip (_("Your data is being backed up. Please don't reboot or shutdown."))
self._menu = gtk.Menu ()
self._quit_item = gtk.ImageMenuItem (stock_id=gtk.STOCK_QUIT)
@@ -76,10 +77,22 @@
self._manager_found = False
self._timestamp = time.time ()
+ self._sections = 10
+ aps = (2 * math.pi) / self._sections
+ self._spacing_size = aps * .1
+ self._section_size = aps - self._spacing_size
+ self._opacity_scale = 1.0 / float (self._sections)
+ self._pixbufs = []
+ self._idx = 0
+
+ self._color = gtk.Entry ().style.bg[gtk.STATE_SELECTED]
+ self._create_all ()
self._quit_item.connect ("activate", self._quit)
self.connect ("popup-menu", self._popup_menu)
self.connect ("activate", self._activate)
+
gobject.timeout_add (3000, self.backup_manager_running)
+ gobject.timeout_add (200, self._animate_cb)
def _quit (self, b):
self._log_window.stop ()
@@ -94,6 +107,52 @@
self._showing = True
self._log_window.start ()
+ def _animate_cb (self):
+ self.set_from_pixbuf (self._pixbufs[self._idx])
+ self._idx = (self._idx + 1) % self._sections
+ return True
+
+ def _create_all (self):
+ w = h = 24
+ png = os.path.join (os.path.dirname (get_config_location ()), "tmp.png")
+
+ try:
+ os.makedirs (os.path.dirname (png), mode=0755)
+ os.chmod (os.path.dirname (png), 0755)
+ except OSError, e:
+ if e.errno != errno.EEXIST:
+ raise
+
+ for p in xrange (0, self._sections):
+ imgs = cairo.ImageSurface (cairo.FORMAT_ARGB32, w, h)
+ cr = cairo.Context (imgs)
+ cr.set_line_width (5)
+ spot = 0.0
+
+ for i in xrange (0, self._sections):
+ cr.new_path ()
+
+ ri = i
+ rd = 0
+ for j in xrange (0, self._sections):
+ if ri == p:
+ break
+
+ ri = (ri + 1) % self._sections
+ rd += 1
+
+ spot = spot + self._section_size + self._spacing_size
+ cr.set_source_rgba (self._color.red / 65535.0,
+ self._color.green / 65535.0,
+ self._color.blue / 65535.0,
+ (self._sections - rd) * self._opacity_scale)
+ cr.arc (w / 2, h / 2, h / 2 - 5, spot, spot + self._section_size)
+ cr.stroke ()
+
+ imgs.write_to_png (png)
+ self._pixbufs.append (gtk.gdk.pixbuf_new_from_file (png))
+ os.unlink (png)
+
def backup_manager_running (self):
p = subprocess.Popen (["ps x --user %s | grep backup-manager | grep -v grep | awk '{print $1}'" % \
(os.getlogin ())], stdout=subprocess.PIPE, close_fds=True, shell=True)
@@ -122,7 +181,7 @@
gettext.textdomain ("backup-manager")
bus = dbus.SessionBus ()
- ret = bus.request_name ("com.google.code.BackupManagerApplet", dbus.bus.NAME_FLAG_DO_NOT_QUEUE)
+ ret = bus.request_name ("org.opensuse.BackupManagerApplet", dbus.bus.NAME_FLAG_DO_NOT_QUEUE)
if ret != dbus.bus.REQUEST_NAME_REPLY_PRIMARY_OWNER:
print _("An instance is already running...")
sys.exit (0)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/backup-manager-0.1.0/backup_manager/core.py new/backup-manager-0.1.0/backup_manager/core.py
--- old/backup-manager-0.1.0/backup_manager/core.py 2008-10-24 20:43:30.000000000 +0200
+++ new/backup-manager-0.1.0/backup_manager/core.py 2008-11-03 18:29:37.000000000 +0100
@@ -165,13 +165,13 @@
try:
pk = dbus.SessionBus ().get_object ("org.freedesktop.PolicyKit.AuthenticationAgent", "/")
pk_agent = dbus.Interface (pk, "org.freedesktop.PolicyKit.AuthenticationAgent")
- ok = pk_agent.ObtainAuthorization ("com.google.code.backupmanager.schedule",
+ ok = pk_agent.ObtainAuthorization ("org.opensuse.backupmanager.schedule",
dbus.UInt32 (0), dbus.UInt32 (os.getpid ()))
#FIXME
print "Granted:", bool (ok)
- bm = dbus.SystemBus ().get_object ("com.google.code.BackupManager", "/com/google/code/BackupManager")
- bm_if = dbus.Interface (bm, "com.google.code.BackupManager")
+ bm = dbus.SystemBus ().get_object ("org.opensuse.BackupManager", "/org/opensuse/BackupManager")
+ bm_if = dbus.Interface (bm, "org.opensuse.BackupManager")
if config.backup_schedule == SCHEDULE_NEVER:
bm_if.RemoveSchedule ()
else:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/backup-manager-0.1.0/backup_manager/service.py new/backup-manager-0.1.0/backup_manager/service.py
--- old/backup-manager-0.1.0/backup_manager/service.py 2008-10-24 21:00:39.000000000 +0200
+++ new/backup-manager-0.1.0/backup_manager/service.py 2008-11-03 18:28:57.000000000 +0100
@@ -100,12 +100,12 @@
_set_cron_contents (user, lines)
class BackupManagerServiceException (dbus.DBusException):
- _dbus_error_name = "com.google.code.BackupManagerServiceException"
+ _dbus_error_name = "org.opensuse.BackupManagerServiceException"
class BackupManagerService (dbus.service.Object):
def __init__ (self):
- bn = dbus.service.BusName ("com.google.code.BackupManager", bus=dbus.SystemBus ())
- dbus.service.Object.__init__ (self, bn, "/com/google/code/BackupManager")
+ bn = dbus.service.BusName ("org.opensuse.BackupManager", bus=dbus.SystemBus ())
+ dbus.service.Object.__init__ (self, bn, "/org/opensuse/BackupManager")
def _get_user_if_authorized (self, sender):
if not sender:
@@ -118,18 +118,18 @@
pk_service = sys_bus.get_object ("org.freedesktop.PolicyKit", "/")
pk = dbus.Interface (pk_service, "org.freedesktop.PolicyKit")
- authed = pk.IsSystemBusNameAuthorized ("com.google.code.backupmanager.schedule", sender, False)
+ authed = pk.IsSystemBusNameAuthorized ("org.opensuse.backupmanager.schedule", sender, False)
if authed != "yes":
raise BackupManagerServiceException ("Not authorized")
return pwd.getpwuid (user_id)[0]
- @dbus.service.method ("com.google.code.BackupManager", in_signature="", out_signature="", sender_keyword="sender")
+ @dbus.service.method ("org.opensuse.BackupManager", in_signature="", out_signature="", sender_keyword="sender")
def RemoveSchedule (self, sender=None):
user = self._get_user_if_authorized (sender)
remove_schedule (user)
- @dbus.service.method ("com.google.code.BackupManager", in_signature="s", out_signature="", sender_keyword="sender")
+ @dbus.service.method ("org.opensuse.BackupManager", in_signature="s", out_signature="", sender_keyword="sender")
def AddSchedule (self, schedule, sender=None):
user = self._get_user_if_authorized (sender)
add_schedule (user, schedule)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/backup-manager-0.1.0/backup_manager.egg-info/SOURCES.txt new/backup-manager-0.1.0/backup_manager.egg-info/SOURCES.txt
--- old/backup-manager-0.1.0/backup_manager.egg-info/SOURCES.txt 2008-10-24 21:03:23.000000000 +0200
+++ new/backup-manager-0.1.0/backup_manager.egg-info/SOURCES.txt 2008-11-03 18:39:35.000000000 +0100
@@ -1,5 +1,7 @@
LICENSES
MANIFEST.in
+backup-manager.spec
+build-catalogs.sh
setup.cfg
setup.py
backup_manager/__init__.py
@@ -18,8 +20,8 @@
backup_manager.egg-info/top_level.txt
conf/99-backup-manager.fdi
conf/backup-manager.conf
-conf/com.google.code.BackupManager.service
-conf/com.google.code.backupmanager.policy
+conf/org.opensuse.BackupManager.service
+conf/org.opensuse.backupmanager.policy
po/backup_manager.pot
po/de.po
po/en.po
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/backup-manager-0.1.0/backup-manager.spec new/backup-manager-0.1.0/backup-manager.spec
--- old/backup-manager-0.1.0/backup-manager.spec 1970-01-01 01:00:00.000000000 +0100
+++ new/backup-manager-0.1.0/backup-manager.spec 2008-11-03 18:26:25.000000000 +0100
@@ -0,0 +1,55 @@
+Name: backup-manager
+BuildRequires: python >= 2.6 python-devel python-setuptools dbus-1-devel PolicyKit-devel intltool gettext-tools
+URL: http://code.google.com/p/wolfheads/
+License: X11/MIT
+Group: Productivity/Other
+Requires: python >= 2.6 python-gtk python-setuptools rdiff-backup >= 1.2 PolicyKit PolicyKit-gnome dbus-1 dbus-1-python libnotify
+Autoreqprov: on
+Version: 0.1.0
+Release: 1
+Summary: A simple backup application for GNOME
+Source: %{name}-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+
+%description
+A simple backup application for GNOME
+
+Authors:
+--------
+ Chris Rivera