--- gdeskcal-0.57.1.orig/gdeskcal
+++ gdeskcal-0.57.1/gdeskcal
@@ -103,4 +103,4 @@
dcal = CalMediator()
-gtk.mainloop()
+gtk.main()
--- gdeskcal-0.57.1.orig/code/values.py
+++ gdeskcal-0.57.1/code/values.py
@@ -15,7 +15,7 @@
# files
SKINFILE = "skin.xml"
CONFIGFILE = "config.xml"
-EVOLUTION_CALENDAR = "~/evolution/local/Calendar/calendar.ics"
+EVOLUTION_CALENDAR = "~/.evolution/calendar/local/system/calendar.ics"
MY_CALENDAR = "calendar.ics"
# config data files
--- gdeskcal-0.57.1.orig/code/CalMediator.py
+++ gdeskcal-0.57.1/code/CalMediator.py
@@ -15,6 +15,7 @@
from planner.Planner import Planner
+import gobject
import gtk
import os
import sys
@@ -216,7 +217,7 @@
self.set_config(self.__config)
month, year = self.__cal.get_month()
- gtk.timeout_add(250, self.__cal.set_month, month, year)
+ gobject.timeout_add(250, self.__cal.set_month, month, year)
self.__cmd_set_month_bg()
@@ -268,7 +269,7 @@
filename = ""
alpha = 0
- gtk.idle_add(self.__window.set_bg_image, filename, alpha)
+ gobject.idle_add(self.__window.set_bg_image, filename, alpha)
@@ -280,7 +281,7 @@
def __cmd_quit(self):
self.__config.save()
- gtk.mainquit()
+ gtk.main_quit()
@@ -326,4 +327,4 @@
#
def __cmd_evolution(self):
- os.system("evolution evolution:/local/Calendar &")
+ os.system("evolution --component=calendar &")
--- gdeskcal-0.57.1.orig/code/FileWatcher.py
+++ gdeskcal-0.57.1/code/FileWatcher.py
@@ -1,6 +1,6 @@
from Observable import Observable
-import gtk
+import gobject
import os
@@ -19,7 +19,7 @@
self.__path = path
self.__mtime = 0
- gtk.timeout_add(500, self.__check_mtime)
+ gobject.timeout_add(500, self.__check_mtime)
@@ -31,6 +31,6 @@
self.__mtime = new_mtime
self.update_observer(self.OBS_CHANGE, self.__path)
except:
- if (not os.path.exists(self.__path)): return gtk.FALSE
+ if (not os.path.exists(self.__path)): return False
- return gtk.TRUE
+ return True
--- gdeskcal-0.57.1.orig/code/Cal.py
+++ gdeskcal-0.57.1/code/Cal.py
@@ -4,6 +4,7 @@
import sfrmapper
import gtk
+import gobject
import pango
import time
import os
@@ -71,22 +72,22 @@
gtk.Fixed.__init__(self)
# month (and year)
- self.__lbl_month = CalLabel(2, 1, gtk.FALSE)
+ self.__lbl_month = CalLabel(2, 1, False)
self.__lbl_month.show()
self.put(self.__lbl_month, 0, 0)
# year alone
- self.__lbl_year = CalLabel(1, 1, gtk.FALSE)
+ self.__lbl_year = CalLabel(1, 1, False)
self.__lbl_year.show()
self.put(self.__lbl_year, 0, 0)
# weekdays
- self.__lbl_weekdays = CalLabel(7, 1, gtk.TRUE)
+ self.__lbl_weekdays = CalLabel(7, 1, True)
self.__lbl_weekdays.show()
self.put(self.__lbl_weekdays, 0, 0)
# days
- self.__lbl_days = CalLabel(7, 6, gtk.TRUE)
+ self.__lbl_days = CalLabel(7, 6, True)
self.__lbl_days.show()
self.put(self.__lbl_days, 0, 0)
@@ -238,8 +239,8 @@
#
def set_month(self, month = 0, year = 0):
- while (gtk.gdk.events_pending()): gtk.mainiteration()
- gtk.idle_add(self.__idle_set_month, month, year)
+ while (gtk.gdk.events_pending()): gtk.main_iteration()
+ gobject.idle_add(self.__idle_set_month, month, year)
def __idle_set_month(self, month, year):
--- gdeskcal-0.57.1.orig/code/BGWatcher.py
+++ gdeskcal-0.57.1/code/BGWatcher.py
@@ -1,7 +1,7 @@
from Observable import Observable
import desktop
-import gtk
+import gobject
import time
@@ -20,7 +20,7 @@
self.__old_bg = 0
self.__last_update = 0
- gtk.timeout_add(50, self.__check_bg)
+ gobject.timeout_add(50, self.__check_bg)
@@ -30,18 +30,18 @@
id = desktop.get_wallpaper_id()
if (id != self.__old_bg):
self.__last_update = str(time.time())
- gtk.timeout_add(500, self.__notify_update, self.__last_update)
- #gtk.idle_add(self.__notify_update, self.__last_update)
+ gobject.timeout_add(500, self.__notify_update, self.__last_update)
+ #gobject.idle_add(self.__notify_update, self.__last_update)
self.__old_bg = id
except StandardError, e:
if (self.__old_bg):
self.__last_update = str(time.time())
- gtk.timeout_add(500, self.__notify_update, self.__last_update)
- #gtk.idle_add(self.__notify_update, self.__last_update)
+ gobject.timeout_add(500, self.__notify_update, self.__last_update)
+ #gobject.idle_add(self.__notify_update, self.__last_update)
self.__old_bg = 0
- return gtk.TRUE
+ return True
@@ -50,4 +50,4 @@
if (timestamp != self.__last_update): return
self.update_observer(self.OBS_CHANGE_BG)
- return gtk.FALSE
+ return False
--- gdeskcal-0.57.1.orig/code/GlassWindow.py
+++ gdeskcal-0.57.1/code/GlassWindow.py
@@ -1,4 +1,5 @@
import desktop
+import gobject
import gtk
@@ -79,7 +80,7 @@
self.__bg_image = gtk.gdk.Pixbuf(0, 1, 8, 10, 10)
self.__bg_image.fill(0xffffff)
- gtk.idle_add(self.update_bg)
+ gobject.idle_add(self.update_bg)
@@ -172,8 +173,8 @@
self.queue_draw()
# wait long enough for the window to disappear; does this work always?
- while (gtk.gdk.events_pending()): gtk.mainiteration()
- gtk.mainiteration()
+ while (gtk.gdk.events_pending()): gtk.main_iteration()
+ gtk.main_iteration()
self.__bg_root = desktop.get_wallpaper_fallback(x, y, width, height)
self.show()
--- gdeskcal-0.57.1.orig/code/ListBox.py
+++ gdeskcal-0.57.1/code/ListBox.py
@@ -21,7 +21,7 @@
types = [gobject.TYPE_STRING] * ncols
self.__liststore = apply(gtk.ListStore, types)
self.__list = gtk.TreeView(self.__liststore)
- self.__list.set_headers_visible(gtk.FALSE)
+ self.__list.set_headers_visible(False)
self.__list.show()
for i in xrange(ncols):
@@ -57,7 +57,7 @@
def set_cursor(self, row):
- self.__list.set_cursor(row, None, gtk.FALSE)
+ self.__list.set_cursor(row, None, False)
--- gdeskcal-0.57.1.orig/code/CalWindow.py
+++ gdeskcal-0.57.1/code/CalWindow.py
@@ -8,6 +8,7 @@
import os
import sys
import gtk
+import gobject
@@ -40,7 +41,7 @@
GlassWindow.__init__(self, gtk.WINDOW_TOPLEVEL)
import icon; self.set_icon(icon.ICON)
self.set_title("gDeskCal")
- self.set_decorated(gtk.FALSE)
+ self.set_decorated(False)
self.stick()
self.connect("delete-event", self.__on_close)
@@ -75,11 +76,11 @@
sys.path.append(os.path.join(gdesklets_home, "utils"))
import _ewmh
self.realize()
- gtk.idle_add(_ewmh.set_below, self.window)
+ gobject.idle_add(_ewmh.set_below, self.window)
except:
- gtk.idle_add(self.set_property, "skip-taskbar-hint", 1)
- gtk.idle_add(self.set_property, "skip-pager-hint", 1)
+ gobject.idle_add(self.set_property, "skip-taskbar-hint", 1)
+ gobject.idle_add(self.set_property, "skip-pager-hint", 1)
# keep window below others
self.connect("focus-in-event", self.__lower_window)
@@ -123,7 +124,7 @@
if (self.window): self.window.lower()
- return gtk.TRUE
+ return True
#
@@ -164,7 +165,7 @@
self.__is_dragging = 1
self.__drag_offset = (x, y)
self.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.FLEUR))
- gtk.timeout_add(20, self.__on_move)
+ gobject.timeout_add(20, self.__on_move)
@@ -196,10 +197,10 @@
x += winx; y += winy
self.move(x - offx, y - offy)
- return gtk.TRUE
+ return True
else:
- return gtk.FALSE
+ return False
@@ -236,7 +237,7 @@
y = max(4, min(y, height - 4))
self.__is_dragging = 1
self.__drag_offset = (x, y)
- gtk.timeout_add(20, self.__on_move)
+ gobject.timeout_add(20, self.__on_move)
--- gdeskcal-0.57.1.orig/code/TimeWatcher.py
+++ gdeskcal-0.57.1/code/TimeWatcher.py
@@ -1,7 +1,7 @@
from Observable import Observable
import time
-import gtk
+import gobject
@@ -17,8 +17,8 @@
# (day, month, year)
self.__today = (1, 1, 1)
- gtk.idle_add(self.__watchtime)
- gtk.timeout_add(3000, self.__save_config)
+ gobject.idle_add(self.__watchtime)
+ gobject.timeout_add(3000, self.__save_config)
@@ -34,7 +34,7 @@
self.__today = (day, month, year)
self.update_observer(self.OBS_NEWDAY, day, month, year)
- gtk.timeout_add(1000, self.__watchtime)
+ gobject.timeout_add(1000, self.__watchtime)
@@ -44,4 +44,4 @@
def __save_config(self):
self.update_observer(self.OBS_SAVE_CONFIG)
- return gtk.TRUE
+ return True
--- gdeskcal-0.57.1.orig/code/Navigation.py
+++ gdeskcal-0.57.1/code/Navigation.py
@@ -13,7 +13,7 @@
#
def __init__(self):
- gtk.HBox.__init__(self, gtk.TRUE, 0)
+ gtk.HBox.__init__(self, True, 0)
# force left-to-right direction for the navigation buttons
self.set_direction(gtk.TEXT_DIR_LTR)
--- gdeskcal-0.57.1.orig/code/SkinBrowser.py
+++ gdeskcal-0.57.1/code/SkinBrowser.py
@@ -36,17 +36,17 @@
# list of skins
self.__list = ListBox([_("Name of Skin")])
- self.__list.set_headers_visible(gtk.TRUE)
+ self.__list.set_headers_visible(True)
self.__list.connect_select_row(self.__on_select)
self.__list.show()
- self.vbox.pack_start(self.__list, gtk.TRUE, gtk.TRUE, 0)
+ self.vbox.pack_start(self.__list, True, True, 0)
#scrwin = gtk.ScrolledWindow()
#scrwin.set_shadow_type(gtk.SHADOW_ETCHED_IN)
#scrwin.set_policy(gtk.POLICY_NEVER,
# gtk.POLICY_AUTOMATIC)
#scrwin.show()
- #self.vbox.pack_start(scrwin, gtk.TRUE, gtk.TRUE, 0)
+ #self.vbox.pack_start(scrwin, True, True, 0)
#self.__liststore = gtk.ListStore(gobject.TYPE_STRING)
#self.__list = gtk.TreeView(self.__liststore)
@@ -67,14 +67,14 @@
img = gtk.Image()
img.set_from_stock(gtk.STOCK_DIALOG_INFO, gtk.ICON_SIZE_DIALOG)
img.show()
- hbox.pack_start(img, gtk.FALSE, gtk.FALSE, 4)
+ hbox.pack_start(img, False, False, 4)
lbl = gtk.Label(_("New skins can be installed by dragging\n"
"them into this window."))
lbl.show()
- hbox.pack_start(lbl, gtk.FALSE, gtk.FALSE, 4)
+ hbox.pack_start(lbl, False, False, 4)
- self.vbox.pack_end(hbox, gtk.FALSE, gtk.FALSE, 8)
+ self.vbox.pack_end(hbox, False, False, 8)
# close button
@@ -147,7 +147,7 @@
def __on_close(self, *args):
self.hide()
- return gtk.TRUE
+ return True
--- gdeskcal-0.57.1.orig/code/planner/iCalLoader.py
+++ gdeskcal-0.57.1/code/planner/iCalLoader.py
@@ -216,8 +216,8 @@
self.__objects[-1].add_event(event)
self.__objects.append(event)
- rrule = event.get_recurrences()
- event.set_recurrences(rrule)
+ rrule = event.get_recurrences()
+ # event.set_recurrences(rrule)
while (1):
l = lines.pop()
--- gdeskcal-0.57.1.orig/code/planner/CalEditor.py
+++ gdeskcal-0.57.1/code/planner/CalEditor.py
@@ -61,7 +61,7 @@
self.__events_frame = gtk.Frame("")
self.__events_frame.set_border_width(4)
self.__events_frame.show()
- self.vbox.pack_start(self.__events_frame, gtk.TRUE, gtk.TRUE, 0)
+ self.vbox.pack_start(self.__events_frame, True, True, 0)
hbox = gtk.HBox()
hbox.set_border_width(4)
@@ -70,24 +70,24 @@
# list of appointments
self.__listbox = ListBox(["Time", "Summary"])
- #self.__listbox.set_headers_visible(gtk.TRUE)
+ #self.__listbox.set_headers_visible(True)
self.__listbox.connect_select_row(self.__on_select)
self.__listbox.show()
- hbox.pack_start(self.__listbox, gtk.TRUE, gtk.TRUE, 0)
+ hbox.pack_start(self.__listbox, True, True, 0)
# buttons
vbox = gtk.VBox()
vbox.show()
- hbox.pack_end(vbox, gtk.FALSE, gtk.FALSE, 4)
+ hbox.pack_end(vbox, False, False, 4)
btn1 = self.__create_button(gtk.STOCK_NEW, _("New Appointment"))
btn1.connect("clicked", self.__on_button, self.__CMD_NEW)
btn1.show()
- vbox.pack_start(btn1, gtk.FALSE, gtk.FALSE, 4)
+ vbox.pack_start(btn1, False, False, 4)
btn2 = self.__create_button(gtk.STOCK_DELETE, _("Remove Appointment"))
btn2.connect("clicked", self.__on_button, self.__CMD_REMOVE)
btn2.show()
- vbox.pack_start(btn2, gtk.FALSE, gtk.FALSE, 4)
+ vbox.pack_start(btn2, False, False, 4)
#
@@ -96,7 +96,7 @@
self.__edit_frame = gtk.Frame(_("Edit Appointment"))
self.__edit_frame.set_border_width(4)
self.__edit_frame.show()
- self.vbox.pack_start(self.__edit_frame, gtk.FALSE, gtk.FALSE, 0)
+ self.vbox.pack_start(self.__edit_frame, False, False, 0)
tbl = gtk.Table(3, 2)
tbl.set_border_width(4)
@@ -133,18 +133,18 @@
self.__entry_hours.set_range(0, 23)
self.__entry_hours.set_increments(1, 5)
self.__entry_hours.show()
- hbox.pack_start(self.__entry_hours, gtk.FALSE, gtk.FALSE, 0)
+ hbox.pack_start(self.__entry_hours, False, False, 0)
lbl = gtk.Label(" : ")
lbl.show()
- hbox.pack_start(lbl, gtk.FALSE, gtk.FALSE, 0)
+ hbox.pack_start(lbl, False, False, 0)
self.__entry_mins = gtk.SpinButton(climb_rate = 1, digits = 0)
self.__entry_mins.connect("value-changed", self.__on_time_change, 1)
self.__entry_mins.set_range(0, 59)
self.__entry_mins.set_increments(1, 10)
self.__entry_mins.show()
- hbox.pack_start(self.__entry_mins, gtk.FALSE, gtk.FALSE, 0)
+ hbox.pack_start(self.__entry_mins, False, False, 0)
# recurrence entry
lbl = gtk.Label(_("Recurrences:"))
@@ -176,12 +176,12 @@
img = gtk.Image()
img.set_from_stock(icon, gtk.ICON_SIZE_BUTTON)
img.show()
- box.pack_start(img, gtk.FALSE, gtk.FALSE, 4)
+ box.pack_start(img, False, False, 4)
#end if
lbl = gtk.Label(label)
lbl.show()
- box.pack_start(lbl, gtk.FALSE, gtk.FALSE, 4)
+ box.pack_start(lbl, False, False, 4)
return btn
@@ -217,6 +217,9 @@
elif (p and p[0] == "{"):
entries = p[1:-1].split("|")
+ # The GTK devs deprecated OptionMenu in favor of ComboBox
+ # but there is no quick way to fix it, ComboBox is a beast in
+ # comparison to this simplicity. --KW
option = gtk.OptionMenu()
option.show()
menu = gtk.Menu()
@@ -235,7 +238,7 @@
lbl.show()
widget = lbl
- hbox.pack_start(widget, gtk.FALSE, gtk.FALSE, 0)
+ hbox.pack_start(widget, False, False, 0)
#end for
return hbox
@@ -251,7 +254,7 @@
if (self.__changed_flag and self.__close_handler):
self.__close_handler()
- return gtk.TRUE
+ return True
@@ -264,7 +267,7 @@
summary = self.__current_event.get_summary()
hours, mins, secs = self.__current_event.get_start().get_daytime()
- self.__edit_frame.set_sensitive(gtk.TRUE)
+ self.__edit_frame.set_sensitive(True)
self.__entry_summary.set_text(self.__current_event.get_summary())
self.__entry_hours.set_value(hours)
self.__entry_mins.set_value(mins)
@@ -393,7 +396,7 @@
row = self.__listbox.get_cursor()
self.__calendar.remove_event(self.__current_event)
self.__current_event = None
- self.__edit_frame.set_sensitive(gtk.FALSE)
+ self.__edit_frame.set_sensitive(False)
self.__display_events()
row = min(row, len(self.__events) - 1)
if (row >= 0): self.__listbox.set_cursor(row)
@@ -474,10 +477,10 @@
date = formats.YEARDATEFORMAT % vars()
self.__events_frame.set_label(_("Your appointments on %(date)s")
% vars())
- self.__edit_frame.set_sensitive(gtk.FALSE)
+ self.__edit_frame.set_sensitive(False)
self.__display_events()
- gtk.idle_add(unblock, self)
+ gobject.idle_add(unblock, self)
--- gdeskcal-0.57.1.orig/code/planner/Popup.py
+++ gdeskcal-0.57.1/code/planner/Popup.py
@@ -40,7 +40,7 @@
self.__vbox = gtk.VBox()
self.__vbox.show()
- vbox.pack_start(self.__vbox, gtk.TRUE, gtk.TRUE, 0)
+ vbox.pack_start(self.__vbox, True, True, 0)
@@ -61,7 +61,7 @@
align = gtk.Alignment(1, 0.5, 0, 0)
align.show()
- item.pack_start(align, gtk.FALSE, gtk.FALSE, 10)
+ item.pack_start(align, False, False, 10)
lbl = gtk.Label("")
lbl.set_markup("%(etime)s" % vars())
lbl.show()
@@ -69,7 +69,7 @@
align = gtk.Alignment(0, 0.5, 0, 0)
align.show()
- item.pack_start(align, gtk.TRUE, gtk.TRUE, 8)
+ item.pack_start(align, True, True, 8)
lbl = gtk.Label("")
lbl.set_justify(gtk.JUSTIFY_LEFT)
lbl.set_markup("%(text)s" % vars())
@@ -79,7 +79,7 @@
if (location):
align = gtk.Alignment(1, 0.5, 0, 0)
align.show()
- item.pack_start(align, gtk.FALSE, gtk.FALSE, 4)
+ item.pack_start(align, False, False, 4)
lbl = gtk.Label("")
lbl.set_justify(gtk.JUSTIFY_LEFT)
lbl.set_markup("[%(location)s]" % vars())
@@ -94,7 +94,7 @@
img = gtk.Image()
img.show()
img.set_from_file(imgfile)
- item.pack_end(img, gtk.FALSE, gtk.FALSE, 2)
+ item.pack_end(img, False, False, 2)
#end for
return item
@@ -130,10 +130,10 @@
sep = gtk.HSeparator()
sep.show()
- self.__vbox.pack_start(sep, gtk.FALSE, gtk.FALSE, 0)
+ self.__vbox.pack_start(sep, False, False, 0)
item = self.__create_item(etime, summary, location, categs)
- self.__vbox.pack_start(item, gtk.FALSE, gtk.FALSE, 8)
+ self.__vbox.pack_start(item, False, False, 8)
#end for
# this does not resize the window to 10, 10 but to its minimal size
--- gdeskcal-0.57.1.orig/code/planner/cal/Date.py
+++ gdeskcal-0.57.1/code/planner/cal/Date.py
@@ -1,5 +1,6 @@
import time
import calendar
+from datetime import datetime,timedelta
@@ -23,6 +24,13 @@
if (is_utc): self.__utc_to_localtime()
+ # Validate the time
+ try:
+ sttime = self._to_time()
+ except ValueError:
+ print "********* Date.__init__() ERROR: This date does not exist: %s %s %s %s:%s:%s" % (year, month, day, hours, mins, secs)
+
+
def __cmp__(self, other):
@@ -98,52 +106,22 @@
#
def add_time(self, dyear, dmonth, dday, dhour = 0, dmin = 0, dsec = 0):
- current_time = self._to_time()
- year = current_time[0]
- month = current_time[1]
- day = current_time[2]
- julian_day = current_time[7]
-
- if (calendar.isleap(year)): ndays = 366
- else: ndays = 365
-
-
- julian_day += dday
- while (julian_day > ndays):
- julian_day -= ndays
- year += 1
- while (julian_day < 1):
- julian_day += ndays
- year -= 1
-
- month += dmonth
- while (month > 12):
- month -= 12
- year += 1
- while (month < 1):
- month += 12
- year -= 1
-
- year += dyear
-
-
- if (dday):
- t = time.strptime("%(year)d %(julian_day)d" % vars(),
- "%Y %j")
- elif (dyear):
- t = time.strptime("%(year)d %(month)d %(day)d" % vars(),
- "%Y %m %d")
-
- else:
- t = time.strptime("%(year)d %(month)d %(day)d" % vars(),
- "%Y %m %d")
- #t = time.strptime("%(year)d %(month)d %(julian_day)d" % vars(),
- # "%Y %m %j")
+ old_time = self._to_time()
+ dt_current_time = datetime.fromtimestamp(time.mktime(old_time))
+ delta = timedelta(dday, 0, 0, 0, 0, 0, dmonth * 4 + dyear * 52 )
- self.__year = t[0]
+ dt_current_time = dt_current_time + delta
+
+ t = dt_current_time.timetuple()
+
+ self.__year = t[0]
self.__month = t[1]
- self.__day = t[2]
+ self.__day = t[2]
+ self.__hours = t[3]
+ self.__mins = t[4]
+ self.__secs = t[5]
+ # add any hours, minutes or seconds separately. Why? -KW
if (dhour or dmin or dsec): self.__add_daytime(dhour, dmin, dsec)
@@ -180,8 +158,6 @@
self.__mins = cm
self.__secs = cs
-
-
#
# Returns the time interval to another date in seconds.
#
--- gdeskcal-0.57.1.orig/debian/rules
+++ gdeskcal-0.57.1/debian/rules
@@ -0,0 +1,58 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+build:
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp debian/deskcal
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+ mkdir -p debian/gdeskcal/usr/share/gdeskcal/code
+ install -m 0755 gdeskcal debian/gdeskcal/usr/share/gdeskcal
+ cp -a code/* debian/gdeskcal/usr/share/gdeskcal/code/
+ cp -a data debian/gdeskcal/usr/share/gdeskcal/data
+ cp -a skins debian/gdeskcal/usr/share/gdeskcal/skins
+ cp -a locale debian/gdeskcal/usr/share/gdeskcal/locale
+
+ for i in `find debian/gdeskcal -type f`; do \
+ sed '1s,#!.*python[^ ]*\(.*\),#!/usr/bin/python,' \
+ $$i > $$i.temp; \
+ if cmp --quiet $$i $$i.temp; then \
+ rm -f $$i.temp; \
+ else \
+ mv -f $$i.temp $$i; \
+ chmod 755 $$i; \
+ echo "fixed interpreter: $$i"; \
+ fi; \
+ done
+
+# Build architecture-independent files here.
+binary-indep: build install
+ dh_testdir
+ dh_testroot
+ dh_installdocs
+ dh_installchangelogs
+ dh_installman
+ dh_installmenu
+ dh_python2
+ dh_link usr/share/gdeskcal/gdeskcal usr/bin/gdeskcal
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary-arch:
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
--- gdeskcal-0.57.1.orig/debian/changelog
+++ gdeskcal-0.57.1/debian/changelog
@@ -0,0 +1,255 @@
+gdeskcal (0.57.1-2.2ubuntu1) saucy; urgency=low
+
+ * Merge from Debian unstable. Remaining changes:
+ - code/{CalMediator.py,values.py}: Fix Evolution support.
+
+ -- Logan Rosen Sun, 09 Jun 2013 17:58:47 -0400
+
+gdeskcal (0.57.1-2.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Convert to dh_python2 (Closes: #616822).
+
+ -- Luca Falavigna Tue, 28 May 2013 09:25:50 +0200
+
+gdeskcal (0.57.1-2.1ubuntu1) lucid; urgency=low
+
+ * Merge from Debian unstable. Remaining changes:
+ + Fix Evolution support
+
+ -- Chow Loong Jin Tue, 09 Mar 2010 00:48:27 +0800
+
+gdeskcal (0.57.1-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/control:
+ - Remove python-xml dependency, xml module has been included in
+ Python already (Closes: #468590).
+ - Remove python-numeric dependency, python-numpy will provide it via
+ python-gtk2 (Closes: #478442).
+
+ -- Luca Falavigna Mon, 21 Sep 2009 00:34:20 +0200
+
+gdeskcal (0.57.1-2ubuntu2) hardy; urgency=low
+
+ * Add debian/pycompat file
+ * debian/compat: change to 5
+ * debian/control:
+ - Bump Debian Standards-Version to 3.7.3
+ - Move Homepage field to Source stanza
+ - Modify Maintainer value to match the DebianMaintainerField spec
+ - B-D-I: change Python's minimum version to 2.4
+ - Move debhelper to B-D and change it to (>= 5)
+ - Remove python-xml dependency as some of its modules are now in
+ Python's standard library since version 2.4 (LP: #199014)
+ - Change XB-Python-Version to >= 2.4
+
+ -- Iulian Udrea Mon, 10 Mar 2008 12:19:23 +0000
+
+gdeskcal (0.57.1-2ubuntu1) edgy; urgency=low
+
+ * Merge from Debian unstable. Remaining changes:
+ - Fix Evolution support.
+
+ -- William Alexander Grant Fri, 22 Sep 2006 09:53:03 +1000
+
+gdeskcal (0.57.1-2) unstable; urgency=low
+
+ * Updated for new python policy (Closes: #380811)
+ * debian/control:
+ - Build-Depends on python-all-dev, python-central (>= 0.5)
+ - updated Standards-Version to 3.7.2
+ - use XS-Python-Version and XB-Python-Version
+ * debian/patches/gdeskcal-0.57.1-deprecations.diff:
+ - applied patch by "Kacper Wysocki" to the source code,
+ fix warnings about deprecation (Closes: #383732)
+ * debian/patches/gdeskcal-0.57.1-timeparse.diff:
+ - applied patch by "Kacper Wysocki" to the source code,
+ fix a time validation bug (Closes: #295644)
+ * debian/rules:
+ - call dh_pycentral
+
+ -- Sebastien Bacher Mon, 18 Sep 2006 00:36:31 +0200
+
+gdeskcal (0.57.1-1ubuntu2) dapper; urgency=low
+
+ * Fix evolution support (Closes Malone: #45321)
+ - Thanks to Whoopie for the patch.
+
+ -- Barry deFreese Sat, 20 May 2006 13:21:28 -0400
+
+gdeskcal (0.57.1-1ubuntu1) hoary; urgency=low
+
+ * rebuilt with python 2.4
+ * updated standards version
+
+ -- Daniel Holbach Wed, 16 Feb 2005 09:51:30 +0100
+
+gdeskcal (0.57.1-1) unstable; urgency=low
+
+ * New upstream release
+ + fix transparency problem with pygtk 2.2
+
+ -- Sebastien Bacher Mon, 15 Mar 2004 23:28:33 +0100
+
+gdeskcal (0.57-1) unstable; urgency=low
+
+ * New upstream release
+ + uses ewmh module from gdesklets if available: that fix the focus and
+ windows list problems (Closes: #218146, #228965).
+ * debian/control:
+ + recommends gdesklets for the ewmh module
+
+ -- Sebastien Bacher Thu, 4 Mar 2004 21:25:49 +0100
+
+gdeskcal (0.56.0.1-1) unstable; urgency=low
+
+ * New themes :
+ + August Big
+ + Clear Lemon
+ + XFCE
+
+ -- Sebastien Bacher Thu, 12 Feb 2004 22:27:57 +0100
+
+gdeskcal (0.56-1) unstable; urgency=low
+
+ * New upstream release
+ + fixed endless loop bug (Closes: #221406).
+ + fixed slash and ampersand bugs in event summaries
+ (Closes: #216064, #217697).
+
+ -- Sebastien Bacher Fri, 16 Jan 2004 22:29:29 +0100
+
+gdeskcal (0.55-3) unstable; urgency=low
+
+ * Added missing Build-Depends on python (Closes: #207861).
+
+ -- Sebastien Bacher Sat, 30 Aug 2003 12:10:44 +0200
+
+gdeskcal (0.55-2) unstable; urgency=low
+
+ * Removed postinst and prerm since dh_python generates them (Closes: #207303).
+ * debian/rules
+ + Fixed interpreter of python files.
+
+ -- Sebastien Bacher Tue, 26 Aug 2003 13:12:42 +0200
+
+gdeskcal (0.55-1) unstable; urgency=low
+
+ * New upstream version.
+ * Added new themes.
+ * Updated Depends and Build-Depends.
+ * Updated to Standards-Version 3.6.1.0.
+ * Use dh_python.
+
+ -- Sebastien Bacher Fri, 22 Aug 2003 20:05:45 +0200
+
+gdeskcal (0.54-3) unstable; urgency=low
+
+ * Added python-numeric to Depends (Closes: #205263).
+
+ -- Sebastien Bacher Thu, 14 Aug 2003 01:06:21 +0200
+
+gdeskcal (0.54-2) unstable; urgency=low
+
+ * Updated depends since python 2.3 is the default version (Closes: #205006).
+ * Updated Standards-Version to 3.6.0.
+
+ -- Sebastien Bacher Tue, 12 Aug 2003 00:00:49 +0200
+
+gdeskcal (0.54-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Sebastien Bacher Thu, 24 Jul 2003 12:46:39 +0200
+
+gdeskcal (0.53-1) unstable; urgency=low
+
+ * New upstream release.
+ - no longer visible in the Gnome pager (Closes: #198821).
+ * Added skins from the gdeskcal website (Closes: #184551).
+
+ -- Sebastien Bacher Fri, 27 Jun 2003 12:54:42 +0200
+
+gdeskcal (0.52-1) unstable; urgency=low
+
+ * New upstream release.
+ * Updated to standards version 3.5.10.0.
+
+ -- Sebastien Bacher Sun, 8 Jun 2003 12:18:20 +0200
+
+gdeskcal (0.51-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Sebastien Bacher Wed, 21 May 2003 19:27:45 +0200
+
+gdeskcal (0.50-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Sebastien Bacher Sun, 4 May 2003 19:39:59 +0200
+
+gdeskcal (0.42-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Sebastien Bacher Tue, 29 Apr 2003 16:45:36 +0200
+
+gdeskcal (0.41-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Sebastien Bacher Sat, 26 Apr 2003 15:38:47 +0200
+
+gdeskcal (0.40-2) unstable; urgency=low
+
+ * Added a menu entry (Closes: #187212).
+
+ -- Sebastien Bacher Wed, 16 Apr 2003 14:42:51 +0200
+
+gdeskcal (0.40-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Sebastien Bacher Wed, 16 Apr 2003 11:13:07 +0200
+
+gdeskcal (0.34-1) unstable; urgency=low
+
+ * New upstream release.
+ * Updated to standards version 3.5.9.
+ * Updated Description to add Author and Homepage.
+
+ -- Sebastien Bacher Sun, 30 Mar 2003 15:03:02 +0200
+
+gdeskcal (0.33-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Sebastien Bacher Tue, 18 Mar 2003 16:22:22 +0100
+
+gdeskcal (0.32-1) unstable; urgency=low
+
+ * New upstream release.
+ * Remove Depends on bsdmainutils.
+
+ -- Sebastien Bacher Wed, 12 Mar 2003 00:50:03 +0100
+
+gdeskcal (0.31-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Sebastien Bacher Mon, 3 Mar 2003 15:26:12 +0100
+
+gdeskcal (0.30-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Sebastien Bacher Thu, 27 Feb 2003 18:39:41 +0100
+
+gdeskcal (0.22-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Sebastien Bacher Mon, 24 Feb 2003 18:27:04 +0100
+
--- gdeskcal-0.57.1.orig/debian/compat
+++ gdeskcal-0.57.1/debian/compat
@@ -0,0 +1 @@
+4
--- gdeskcal-0.57.1.orig/debian/copyright
+++ gdeskcal-0.57.1/debian/copyright
@@ -0,0 +1,13 @@
+This package was debianized by Sebastien Bacher on
+Mon, 24 Feb 2003 18:27:04 +0100.
+
+It was downloaded from http://www.pycage.de/software_gdeskcal.html
+
+Upstream Author: Martin Grimme
+
+Copyright:
+
+You are free to redistribute this software under the terms of the GNU
+General Public License.
+On Debian systems, the complete text of the GNU General Public License can
+be found at /usr/share/common-licenses/GPL.
--- gdeskcal-0.57.1.orig/debian/gdeskcal.manpages
+++ gdeskcal-0.57.1/debian/gdeskcal.manpages
@@ -0,0 +1 @@
+debian/gdeskcal.1
--- gdeskcal-0.57.1.orig/debian/gdeskcal.1
+++ gdeskcal-0.57.1/debian/gdeskcal.1
@@ -0,0 +1,60 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH gdeskcal "1" "February 24, 2003"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh disable hyphenation
+.\" .hy enable hyphenation
+.\" .ad l left justify
+.\" .ad b justify to both left and right margins
+.\" .nf disable filling
+.\" .fi enable filling
+.\" .br insert line break
+.\" .sp insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+gdeskcal \- A cute little eye-candy calendar for your desktop.
+
+.SH SYNOPSIS
+.B gdeskcal [ options ]
+
+.SH DESCRIPTION
+.B gdeskcal
+is a cute little eye-candy calendar for your desktop.
+.PP
+It features transparency with smooth alpha-blending and its appearance can be changed completely by using skins.
+
+.SH OPTIONS
+.B gdeskcal
+accepts the following options:
+
+.B \-\-help
+Displays help about the command line options and exits.
+.TP
+.B \-\-dontsave
+Tells 'gDeskCal' not to save any configuration changes on exit.
+.TP
+.B \-\-dpi=
+Tells 'gDeskCal' that the screen resolution is dots per inch. You normally don't have to use this option since 'gDeskCal' can guess the value. This option affects the scaling of fonts.
+.TP
+.B \-\-opaque
+Causes the calendar to be opaque so you cannot see the background through it. This setting will not be saved.
+.TP
+.B \-\-skin=
+The name of the skin to use. A skin's name is the name of its directory.
+.TP
+.B \-x
+The x coordinate.
+.TP
+.B \-y
+The y coordinate.
+
+.SH AUTHOR
+.B gdeskcal
+was written by Martin Grimme .
+.PP
+This manual page was written by Sebastien Bacher ,
+for the Debian GNU/Linux system (but may be used by others).
--- gdeskcal-0.57.1.orig/debian/menu
+++ gdeskcal-0.57.1/debian/menu
@@ -0,0 +1,5 @@
+?package(gdeskcal):\
+needs="X11"\
+section="Apps/Tools"\
+title="gdeskcal"\
+command="/usr/bin/gdeskcal"
--- gdeskcal-0.57.1.orig/debian/control
+++ gdeskcal-0.57.1/debian/control
@@ -0,0 +1,19 @@
+Source: gdeskcal
+Section: x11
+Priority: optional
+Maintainer: Ubuntu Developers
+XSBC-Original-Maintainer: Sebastien Bacher
+Build-Depends-Indep: debhelper (>= 4.1.65), python-all-dev (>= 2.6.6-3~)
+Standards-Version: 3.7.2
+
+Package: gdeskcal
+Architecture: all
+Depends: ${python:Depends}, python-gtk2 (>= 1.99.17-2)
+Recommends: gdesklets
+Description: A desktop calendar featuring transparency with smooth alpha-blending
+ gDeskCal is a cute little eye-candy calendar for your desktop.
+ It features transparency with smooth alpha-blending and its appearance
+ can be changed completely by using skins.
+ .
+ Author: Martin Grimme
+ Homepage: http://www.pycage.de/software_gdeskcal.html
--- gdeskcal-0.57.1.orig/debian/docs
+++ gdeskcal-0.57.1/debian/docs
@@ -0,0 +1,4 @@
+NEWS
+README
+README.skins
+README.i18n
--- gdeskcal-0.57.1.orig/debian/patches/gdeskcal-0.57.1-timeparse.diff
+++ gdeskcal-0.57.1/debian/patches/gdeskcal-0.57.1-timeparse.diff
@@ -0,0 +1,113 @@
+diff -Nur gdeskcal-0.57.1/code/planner/cal/Date.py gdeskcal-0.57.2-kw/code/planner/cal/Date.py
+--- gdeskcal-0.57.1/code/planner/cal/Date.py 2004-03-15 23:46:05.000000000 +0100
++++ gdeskcal-0.57.2-kw/code/planner/cal/Date.py 2006-05-09 01:13:39.913505056 +0200
+@@ -1,5 +1,6 @@
+ import time
+ import calendar
++from datetime import datetime,timedelta
+
+
+
+@@ -23,6 +24,13 @@
+
+ if (is_utc): self.__utc_to_localtime()
+
++ # Validate the time
++ try:
++ sttime = self._to_time()
++ except ValueError:
++ print "********* Date.__init__() ERROR: This date does not exist: %s %s %s %s:%s:%s" % (year, month, day, hours, mins, secs)
++
++
+
+
+ def __cmp__(self, other):
+@@ -98,52 +106,22 @@
+ #
+ def add_time(self, dyear, dmonth, dday, dhour = 0, dmin = 0, dsec = 0):
+
+- current_time = self._to_time()
+- year = current_time[0]
+- month = current_time[1]
+- day = current_time[2]
+- julian_day = current_time[7]
+-
+- if (calendar.isleap(year)): ndays = 366
+- else: ndays = 365
+-
+-
+- julian_day += dday
+- while (julian_day > ndays):
+- julian_day -= ndays
+- year += 1
+- while (julian_day < 1):
+- julian_day += ndays
+- year -= 1
+-
+- month += dmonth
+- while (month > 12):
+- month -= 12
+- year += 1
+- while (month < 1):
+- month += 12
+- year -= 1
+-
+- year += dyear
+-
+-
+- if (dday):
+- t = time.strptime("%(year)d %(julian_day)d" % vars(),
+- "%Y %j")
+- elif (dyear):
+- t = time.strptime("%(year)d %(month)d %(day)d" % vars(),
+- "%Y %m %d")
+-
+- else:
+- t = time.strptime("%(year)d %(month)d %(day)d" % vars(),
+- "%Y %m %d")
+- #t = time.strptime("%(year)d %(month)d %(julian_day)d" % vars(),
+- # "%Y %m %j")
++ old_time = self._to_time()
++ dt_current_time = datetime.fromtimestamp(time.mktime(old_time))
++ delta = timedelta(dday, 0, 0, 0, 0, 0, dmonth * 4 + dyear * 52 )
+
+- self.__year = t[0]
++ dt_current_time = dt_current_time + delta
++
++ t = dt_current_time.timetuple()
++
++ self.__year = t[0]
+ self.__month = t[1]
+- self.__day = t[2]
++ self.__day = t[2]
++ self.__hours = t[3]
++ self.__mins = t[4]
++ self.__secs = t[5]
+
++ # add any hours, minutes or seconds separately. Why? -KW
+ if (dhour or dmin or dsec): self.__add_daytime(dhour, dmin, dsec)
+
+
+@@ -180,8 +158,6 @@
+ self.__mins = cm
+ self.__secs = cs
+
+-
+-
+ #
+ # Returns the time interval to another date in seconds.
+ #
+diff -Nur gdeskcal-0.57.1/code/planner/iCalLoader.py gdeskcal-0.57.2-kw/code/planner/iCalLoader.py
+--- gdeskcal-0.57.1/code/planner/iCalLoader.py 2004-03-15 23:46:05.000000000 +0100
++++ gdeskcal-0.57.2-kw/code/planner/iCalLoader.py 2006-05-03 20:42:44.513923200 +0200
+@@ -216,8 +216,8 @@
+ self.__objects[-1].add_event(event)
+ self.__objects.append(event)
+
+- rrule = event.get_recurrences()
+- event.set_recurrences(rrule)
++ rrule = event.get_recurrences()
++ # event.set_recurrences(rrule)
+
+ while (1):
+ l = lines.pop()
--- gdeskcal-0.57.1.orig/debian/patches/gdeskcal-0.57.1-deprecations.diff
+++ gdeskcal-0.57.1/debian/patches/gdeskcal-0.57.1-deprecations.diff
@@ -0,0 +1,610 @@
+diff -Nur gdeskcal-0.57.1/code/BGWatcher.py gdeskcal-0.57.2-kw/code/BGWatcher.py
+--- gdeskcal-0.57.1/code/BGWatcher.py 2004-03-15 23:46:05.000000000 +0100
++++ gdeskcal-0.57.2-kw/code/BGWatcher.py 2006-05-09 01:27:41.121621984 +0200
+@@ -1,7 +1,7 @@
+ from Observable import Observable
+ import desktop
+
+-import gtk
++import gobject
+ import time
+
+
+@@ -20,7 +20,7 @@
+ self.__old_bg = 0
+ self.__last_update = 0
+
+- gtk.timeout_add(50, self.__check_bg)
++ gobject.timeout_add(50, self.__check_bg)
+
+
+
+@@ -30,18 +30,18 @@
+ id = desktop.get_wallpaper_id()
+ if (id != self.__old_bg):
+ self.__last_update = str(time.time())
+- gtk.timeout_add(500, self.__notify_update, self.__last_update)
+- #gtk.idle_add(self.__notify_update, self.__last_update)
++ gobject.timeout_add(500, self.__notify_update, self.__last_update)
++ #gobject.idle_add(self.__notify_update, self.__last_update)
+ self.__old_bg = id
+
+ except StandardError, e:
+ if (self.__old_bg):
+ self.__last_update = str(time.time())
+- gtk.timeout_add(500, self.__notify_update, self.__last_update)
+- #gtk.idle_add(self.__notify_update, self.__last_update)
++ gobject.timeout_add(500, self.__notify_update, self.__last_update)
++ #gobject.idle_add(self.__notify_update, self.__last_update)
+ self.__old_bg = 0
+
+- return gtk.TRUE
++ return True
+
+
+
+@@ -50,4 +50,4 @@
+ if (timestamp != self.__last_update): return
+ self.update_observer(self.OBS_CHANGE_BG)
+
+- return gtk.FALSE
++ return False
+diff -Nur gdeskcal-0.57.1/code/Cal.py gdeskcal-0.57.2-kw/code/Cal.py
+--- gdeskcal-0.57.1/code/Cal.py 2004-03-15 23:46:05.000000000 +0100
++++ gdeskcal-0.57.2-kw/code/Cal.py 2006-05-09 01:30:14.521301688 +0200
+@@ -4,6 +4,7 @@
+ import sfrmapper
+
+ import gtk
++import gobject
+ import pango
+ import time
+ import os
+@@ -71,22 +72,22 @@
+ gtk.Fixed.__init__(self)
+
+ # month (and year)
+- self.__lbl_month = CalLabel(2, 1, gtk.FALSE)
++ self.__lbl_month = CalLabel(2, 1, False)
+ self.__lbl_month.show()
+ self.put(self.__lbl_month, 0, 0)
+
+ # year alone
+- self.__lbl_year = CalLabel(1, 1, gtk.FALSE)
++ self.__lbl_year = CalLabel(1, 1, False)
+ self.__lbl_year.show()
+ self.put(self.__lbl_year, 0, 0)
+
+ # weekdays
+- self.__lbl_weekdays = CalLabel(7, 1, gtk.TRUE)
++ self.__lbl_weekdays = CalLabel(7, 1, True)
+ self.__lbl_weekdays.show()
+ self.put(self.__lbl_weekdays, 0, 0)
+
+ # days
+- self.__lbl_days = CalLabel(7, 6, gtk.TRUE)
++ self.__lbl_days = CalLabel(7, 6, True)
+ self.__lbl_days.show()
+ self.put(self.__lbl_days, 0, 0)
+
+@@ -238,8 +239,8 @@
+ #
+ def set_month(self, month = 0, year = 0):
+
+- while (gtk.gdk.events_pending()): gtk.mainiteration()
+- gtk.idle_add(self.__idle_set_month, month, year)
++ while (gtk.gdk.events_pending()): gtk.main_iteration()
++ gobject.idle_add(self.__idle_set_month, month, year)
+
+ def __idle_set_month(self, month, year):
+
+diff -Nur gdeskcal-0.57.1/code/CalMediator.py gdeskcal-0.57.2-kw/code/CalMediator.py
+--- gdeskcal-0.57.1/code/CalMediator.py 2004-03-15 23:46:05.000000000 +0100
++++ gdeskcal-0.57.2-kw/code/CalMediator.py 2006-05-09 01:35:02.244561104 +0200
+@@ -15,6 +15,7 @@
+
+ from planner.Planner import Planner
+
++import gobject
+ import gtk
+ import os
+ import sys
+@@ -216,7 +217,7 @@
+ self.set_config(self.__config)
+
+ month, year = self.__cal.get_month()
+- gtk.timeout_add(250, self.__cal.set_month, month, year)
++ gobject.timeout_add(250, self.__cal.set_month, month, year)
+ self.__cmd_set_month_bg()
+
+
+@@ -268,7 +269,7 @@
+ filename = ""
+ alpha = 0
+
+- gtk.idle_add(self.__window.set_bg_image, filename, alpha)
++ gobject.idle_add(self.__window.set_bg_image, filename, alpha)
+
+
+
+@@ -280,7 +281,7 @@
+ def __cmd_quit(self):
+
+ self.__config.save()
+- gtk.mainquit()
++ gtk.main_quit()
+
+
+
+diff -Nur gdeskcal-0.57.1/code/CalWindow.py gdeskcal-0.57.2-kw/code/CalWindow.py
+--- gdeskcal-0.57.1/code/CalWindow.py 2004-03-15 23:46:05.000000000 +0100
++++ gdeskcal-0.57.2-kw/code/CalWindow.py 2006-05-09 01:28:27.090633632 +0200
+@@ -8,6 +8,7 @@
+ import os
+ import sys
+ import gtk
++import gobject
+
+
+
+@@ -40,7 +41,7 @@
+ GlassWindow.__init__(self, gtk.WINDOW_TOPLEVEL)
+ import icon; self.set_icon(icon.ICON)
+ self.set_title("gDeskCal")
+- self.set_decorated(gtk.FALSE)
++ self.set_decorated(False)
+ self.stick()
+
+ self.connect("delete-event", self.__on_close)
+@@ -75,11 +76,11 @@
+ sys.path.append(os.path.join(gdesklets_home, "utils"))
+ import _ewmh
+ self.realize()
+- gtk.idle_add(_ewmh.set_below, self.window)
++ gobject.idle_add(_ewmh.set_below, self.window)
+
+ except:
+- gtk.idle_add(self.set_property, "skip-taskbar-hint", 1)
+- gtk.idle_add(self.set_property, "skip-pager-hint", 1)
++ gobject.idle_add(self.set_property, "skip-taskbar-hint", 1)
++ gobject.idle_add(self.set_property, "skip-pager-hint", 1)
+
+ # keep window below others
+ self.connect("focus-in-event", self.__lower_window)
+@@ -123,7 +124,7 @@
+
+ if (self.window): self.window.lower()
+
+- return gtk.TRUE
++ return True
+
+
+ #
+@@ -164,7 +165,7 @@
+ self.__is_dragging = 1
+ self.__drag_offset = (x, y)
+ self.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.FLEUR))
+- gtk.timeout_add(20, self.__on_move)
++ gobject.timeout_add(20, self.__on_move)
+
+
+
+@@ -196,10 +197,10 @@
+ x += winx; y += winy
+ self.move(x - offx, y - offy)
+
+- return gtk.TRUE
++ return True
+
+ else:
+- return gtk.FALSE
++ return False
+
+
+
+@@ -236,7 +237,7 @@
+ y = max(4, min(y, height - 4))
+ self.__is_dragging = 1
+ self.__drag_offset = (x, y)
+- gtk.timeout_add(20, self.__on_move)
++ gobject.timeout_add(20, self.__on_move)
+
+
+
+diff -Nur gdeskcal-0.57.1/code/FileWatcher.py gdeskcal-0.57.2-kw/code/FileWatcher.py
+--- gdeskcal-0.57.1/code/FileWatcher.py 2004-03-15 23:46:05.000000000 +0100
++++ gdeskcal-0.57.2-kw/code/FileWatcher.py 2006-05-09 01:28:55.429325496 +0200
+@@ -1,6 +1,6 @@
+ from Observable import Observable
+
+-import gtk
++import gobject
+ import os
+
+
+@@ -19,7 +19,7 @@
+ self.__path = path
+ self.__mtime = 0
+
+- gtk.timeout_add(500, self.__check_mtime)
++ gobject.timeout_add(500, self.__check_mtime)
+
+
+
+@@ -31,6 +31,6 @@
+ self.__mtime = new_mtime
+ self.update_observer(self.OBS_CHANGE, self.__path)
+ except:
+- if (not os.path.exists(self.__path)): return gtk.FALSE
++ if (not os.path.exists(self.__path)): return False
+
+- return gtk.TRUE
++ return True
+diff -Nur gdeskcal-0.57.1/code/GlassWindow.py gdeskcal-0.57.2-kw/code/GlassWindow.py
+--- gdeskcal-0.57.1/code/GlassWindow.py 2004-03-15 23:46:05.000000000 +0100
++++ gdeskcal-0.57.2-kw/code/GlassWindow.py 2006-05-09 01:32:21.610981120 +0200
+@@ -1,4 +1,5 @@
+ import desktop
++import gobject
+ import gtk
+
+
+@@ -79,7 +80,7 @@
+ self.__bg_image = gtk.gdk.Pixbuf(0, 1, 8, 10, 10)
+ self.__bg_image.fill(0xffffff)
+
+- gtk.idle_add(self.update_bg)
++ gobject.idle_add(self.update_bg)
+
+
+
+@@ -172,8 +173,8 @@
+ self.queue_draw()
+
+ # wait long enough for the window to disappear; does this work always?
+- while (gtk.gdk.events_pending()): gtk.mainiteration()
+- gtk.mainiteration()
++ while (gtk.gdk.events_pending()): gtk.main_iteration()
++ gtk.main_iteration()
+
+ self.__bg_root = desktop.get_wallpaper_fallback(x, y, width, height)
+ self.show()
+diff -Nur gdeskcal-0.57.1/code/ListBox.py gdeskcal-0.57.2-kw/code/ListBox.py
+--- gdeskcal-0.57.1/code/ListBox.py 2004-03-15 23:46:05.000000000 +0100
++++ gdeskcal-0.57.2-kw/code/ListBox.py 2006-05-09 01:22:11.733696560 +0200
+@@ -21,7 +21,7 @@
+ types = [gobject.TYPE_STRING] * ncols
+ self.__liststore = apply(gtk.ListStore, types)
+ self.__list = gtk.TreeView(self.__liststore)
+- self.__list.set_headers_visible(gtk.FALSE)
++ self.__list.set_headers_visible(False)
+ self.__list.show()
+
+ for i in xrange(ncols):
+@@ -57,7 +57,7 @@
+
+ def set_cursor(self, row):
+
+- self.__list.set_cursor(row, None, gtk.FALSE)
++ self.__list.set_cursor(row, None, False)
+
+
+
+diff -Nur gdeskcal-0.57.1/code/Navigation.py gdeskcal-0.57.2-kw/code/Navigation.py
+--- gdeskcal-0.57.1/code/Navigation.py 2004-03-15 23:46:05.000000000 +0100
++++ gdeskcal-0.57.2-kw/code/Navigation.py 2006-05-09 01:22:11.735696256 +0200
+@@ -13,7 +13,7 @@
+ #
+ def __init__(self):
+
+- gtk.HBox.__init__(self, gtk.TRUE, 0)
++ gtk.HBox.__init__(self, True, 0)
+ # force left-to-right direction for the navigation buttons
+ self.set_direction(gtk.TEXT_DIR_LTR)
+
+diff -Nur gdeskcal-0.57.1/code/SkinBrowser.py gdeskcal-0.57.2-kw/code/SkinBrowser.py
+--- gdeskcal-0.57.1/code/SkinBrowser.py 2004-03-15 23:46:05.000000000 +0100
++++ gdeskcal-0.57.2-kw/code/SkinBrowser.py 2006-05-09 01:22:11.737695952 +0200
+@@ -36,17 +36,17 @@
+
+ # list of skins
+ self.__list = ListBox([_("Name of Skin")])
+- self.__list.set_headers_visible(gtk.TRUE)
++ self.__list.set_headers_visible(True)
+ self.__list.connect_select_row(self.__on_select)
+ self.__list.show()
+- self.vbox.pack_start(self.__list, gtk.TRUE, gtk.TRUE, 0)
++ self.vbox.pack_start(self.__list, True, True, 0)
+
+ #scrwin = gtk.ScrolledWindow()
+ #scrwin.set_shadow_type(gtk.SHADOW_ETCHED_IN)
+ #scrwin.set_policy(gtk.POLICY_NEVER,
+ # gtk.POLICY_AUTOMATIC)
+ #scrwin.show()
+- #self.vbox.pack_start(scrwin, gtk.TRUE, gtk.TRUE, 0)
++ #self.vbox.pack_start(scrwin, True, True, 0)
+
+ #self.__liststore = gtk.ListStore(gobject.TYPE_STRING)
+ #self.__list = gtk.TreeView(self.__liststore)
+@@ -67,14 +67,14 @@
+ img = gtk.Image()
+ img.set_from_stock(gtk.STOCK_DIALOG_INFO, gtk.ICON_SIZE_DIALOG)
+ img.show()
+- hbox.pack_start(img, gtk.FALSE, gtk.FALSE, 4)
++ hbox.pack_start(img, False, False, 4)
+
+ lbl = gtk.Label(_("New skins can be installed by dragging\n"
+ "them into this window."))
+ lbl.show()
+- hbox.pack_start(lbl, gtk.FALSE, gtk.FALSE, 4)
++ hbox.pack_start(lbl, False, False, 4)
+
+- self.vbox.pack_end(hbox, gtk.FALSE, gtk.FALSE, 8)
++ self.vbox.pack_end(hbox, False, False, 8)
+
+
+ # close button
+@@ -147,7 +147,7 @@
+ def __on_close(self, *args):
+
+ self.hide()
+- return gtk.TRUE
++ return True
+
+
+
+diff -Nur gdeskcal-0.57.1/code/TimeWatcher.py gdeskcal-0.57.2-kw/code/TimeWatcher.py
+--- gdeskcal-0.57.1/code/TimeWatcher.py 2004-03-15 23:46:05.000000000 +0100
++++ gdeskcal-0.57.2-kw/code/TimeWatcher.py 2006-05-09 01:23:22.757899240 +0200
+@@ -1,7 +1,7 @@
+ from Observable import Observable
+
+ import time
+-import gtk
++import gobject
+
+
+
+@@ -17,8 +17,8 @@
+ # (day, month, year)
+ self.__today = (1, 1, 1)
+
+- gtk.idle_add(self.__watchtime)
+- gtk.timeout_add(3000, self.__save_config)
++ gobject.idle_add(self.__watchtime)
++ gobject.timeout_add(3000, self.__save_config)
+
+
+
+@@ -34,7 +34,7 @@
+ self.__today = (day, month, year)
+ self.update_observer(self.OBS_NEWDAY, day, month, year)
+
+- gtk.timeout_add(1000, self.__watchtime)
++ gobject.timeout_add(1000, self.__watchtime)
+
+
+
+@@ -44,4 +44,4 @@
+ def __save_config(self):
+
+ self.update_observer(self.OBS_SAVE_CONFIG)
+- return gtk.TRUE
++ return True
+diff -Nur gdeskcal-0.57.1/code/planner/CalEditor.py gdeskcal-0.57.2-kw/code/planner/CalEditor.py
+--- gdeskcal-0.57.1/code/planner/CalEditor.py 2004-03-15 23:46:05.000000000 +0100
++++ gdeskcal-0.57.2-kw/code/planner/CalEditor.py 2006-05-09 01:48:38.889412216 +0200
+@@ -61,7 +61,7 @@
+ self.__events_frame = gtk.Frame("")
+ self.__events_frame.set_border_width(4)
+ self.__events_frame.show()
+- self.vbox.pack_start(self.__events_frame, gtk.TRUE, gtk.TRUE, 0)
++ self.vbox.pack_start(self.__events_frame, True, True, 0)
+
+ hbox = gtk.HBox()
+ hbox.set_border_width(4)
+@@ -70,24 +70,24 @@
+
+ # list of appointments
+ self.__listbox = ListBox(["Time", "Summary"])
+- #self.__listbox.set_headers_visible(gtk.TRUE)
++ #self.__listbox.set_headers_visible(True)
+ self.__listbox.connect_select_row(self.__on_select)
+ self.__listbox.show()
+- hbox.pack_start(self.__listbox, gtk.TRUE, gtk.TRUE, 0)
++ hbox.pack_start(self.__listbox, True, True, 0)
+
+ # buttons
+ vbox = gtk.VBox()
+ vbox.show()
+- hbox.pack_end(vbox, gtk.FALSE, gtk.FALSE, 4)
++ hbox.pack_end(vbox, False, False, 4)
+
+ btn1 = self.__create_button(gtk.STOCK_NEW, _("New Appointment"))
+ btn1.connect("clicked", self.__on_button, self.__CMD_NEW)
+ btn1.show()
+- vbox.pack_start(btn1, gtk.FALSE, gtk.FALSE, 4)
++ vbox.pack_start(btn1, False, False, 4)
+ btn2 = self.__create_button(gtk.STOCK_DELETE, _("Remove Appointment"))
+ btn2.connect("clicked", self.__on_button, self.__CMD_REMOVE)
+ btn2.show()
+- vbox.pack_start(btn2, gtk.FALSE, gtk.FALSE, 4)
++ vbox.pack_start(btn2, False, False, 4)
+
+
+ #
+@@ -96,7 +96,7 @@
+ self.__edit_frame = gtk.Frame(_("Edit Appointment"))
+ self.__edit_frame.set_border_width(4)
+ self.__edit_frame.show()
+- self.vbox.pack_start(self.__edit_frame, gtk.FALSE, gtk.FALSE, 0)
++ self.vbox.pack_start(self.__edit_frame, False, False, 0)
+
+ tbl = gtk.Table(3, 2)
+ tbl.set_border_width(4)
+@@ -133,18 +133,18 @@
+ self.__entry_hours.set_range(0, 23)
+ self.__entry_hours.set_increments(1, 5)
+ self.__entry_hours.show()
+- hbox.pack_start(self.__entry_hours, gtk.FALSE, gtk.FALSE, 0)
++ hbox.pack_start(self.__entry_hours, False, False, 0)
+
+ lbl = gtk.Label(" : ")
+ lbl.show()
+- hbox.pack_start(lbl, gtk.FALSE, gtk.FALSE, 0)
++ hbox.pack_start(lbl, False, False, 0)
+
+ self.__entry_mins = gtk.SpinButton(climb_rate = 1, digits = 0)
+ self.__entry_mins.connect("value-changed", self.__on_time_change, 1)
+ self.__entry_mins.set_range(0, 59)
+ self.__entry_mins.set_increments(1, 10)
+ self.__entry_mins.show()
+- hbox.pack_start(self.__entry_mins, gtk.FALSE, gtk.FALSE, 0)
++ hbox.pack_start(self.__entry_mins, False, False, 0)
+
+ # recurrence entry
+ lbl = gtk.Label(_("Recurrences:"))
+@@ -176,12 +176,12 @@
+ img = gtk.Image()
+ img.set_from_stock(icon, gtk.ICON_SIZE_BUTTON)
+ img.show()
+- box.pack_start(img, gtk.FALSE, gtk.FALSE, 4)
++ box.pack_start(img, False, False, 4)
+ #end if
+
+ lbl = gtk.Label(label)
+ lbl.show()
+- box.pack_start(lbl, gtk.FALSE, gtk.FALSE, 4)
++ box.pack_start(lbl, False, False, 4)
+
+ return btn
+
+@@ -217,6 +217,9 @@
+
+ elif (p and p[0] == "{"):
+ entries = p[1:-1].split("|")
++ # The GTK devs deprecated OptionMenu in favor of ComboBox
++ # but there is no quick way to fix it, ComboBox is a beast in
++ # comparison to this simplicity. --KW
+ option = gtk.OptionMenu()
+ option.show()
+ menu = gtk.Menu()
+@@ -235,7 +238,7 @@
+ lbl.show()
+ widget = lbl
+
+- hbox.pack_start(widget, gtk.FALSE, gtk.FALSE, 0)
++ hbox.pack_start(widget, False, False, 0)
+ #end for
+
+ return hbox
+@@ -251,7 +254,7 @@
+ if (self.__changed_flag and self.__close_handler):
+ self.__close_handler()
+
+- return gtk.TRUE
++ return True
+
+
+
+@@ -264,7 +267,7 @@
+ summary = self.__current_event.get_summary()
+ hours, mins, secs = self.__current_event.get_start().get_daytime()
+
+- self.__edit_frame.set_sensitive(gtk.TRUE)
++ self.__edit_frame.set_sensitive(True)
+ self.__entry_summary.set_text(self.__current_event.get_summary())
+ self.__entry_hours.set_value(hours)
+ self.__entry_mins.set_value(mins)
+@@ -393,7 +396,7 @@
+ row = self.__listbox.get_cursor()
+ self.__calendar.remove_event(self.__current_event)
+ self.__current_event = None
+- self.__edit_frame.set_sensitive(gtk.FALSE)
++ self.__edit_frame.set_sensitive(False)
+ self.__display_events()
+ row = min(row, len(self.__events) - 1)
+ if (row >= 0): self.__listbox.set_cursor(row)
+@@ -474,10 +477,10 @@
+ date = formats.YEARDATEFORMAT % vars()
+ self.__events_frame.set_label(_("Your appointments on %(date)s")
+ % vars())
+- self.__edit_frame.set_sensitive(gtk.FALSE)
++ self.__edit_frame.set_sensitive(False)
+ self.__display_events()
+
+- gtk.idle_add(unblock, self)
++ gobject.idle_add(unblock, self)
+
+
+
+diff -Nur gdeskcal-0.57.1/code/planner/Popup.py gdeskcal-0.57.2-kw/code/planner/Popup.py
+--- gdeskcal-0.57.1/code/planner/Popup.py 2004-03-15 23:46:05.000000000 +0100
++++ gdeskcal-0.57.2-kw/code/planner/Popup.py 2006-05-09 01:22:11.778689720 +0200
+@@ -40,7 +40,7 @@
+
+ self.__vbox = gtk.VBox()
+ self.__vbox.show()
+- vbox.pack_start(self.__vbox, gtk.TRUE, gtk.TRUE, 0)
++ vbox.pack_start(self.__vbox, True, True, 0)
+
+
+
+@@ -61,7 +61,7 @@
+
+ align = gtk.Alignment(1, 0.5, 0, 0)
+ align.show()
+- item.pack_start(align, gtk.FALSE, gtk.FALSE, 10)
++ item.pack_start(align, False, False, 10)
+ lbl = gtk.Label("")
+ lbl.set_markup("%(etime)s" % vars())
+ lbl.show()
+@@ -69,7 +69,7 @@
+
+ align = gtk.Alignment(0, 0.5, 0, 0)
+ align.show()
+- item.pack_start(align, gtk.TRUE, gtk.TRUE, 8)
++ item.pack_start(align, True, True, 8)
+ lbl = gtk.Label("")
+ lbl.set_justify(gtk.JUSTIFY_LEFT)
+ lbl.set_markup("%(text)s" % vars())
+@@ -79,7 +79,7 @@
+ if (location):
+ align = gtk.Alignment(1, 0.5, 0, 0)
+ align.show()
+- item.pack_start(align, gtk.FALSE, gtk.FALSE, 4)
++ item.pack_start(align, False, False, 4)
+ lbl = gtk.Label("")
+ lbl.set_justify(gtk.JUSTIFY_LEFT)
+ lbl.set_markup("[%(location)s]" % vars())
+@@ -94,7 +94,7 @@
+ img = gtk.Image()
+ img.show()
+ img.set_from_file(imgfile)
+- item.pack_end(img, gtk.FALSE, gtk.FALSE, 2)
++ item.pack_end(img, False, False, 2)
+ #end for
+
+ return item
+@@ -130,10 +130,10 @@
+
+ sep = gtk.HSeparator()
+ sep.show()
+- self.__vbox.pack_start(sep, gtk.FALSE, gtk.FALSE, 0)
++ self.__vbox.pack_start(sep, False, False, 0)
+
+ item = self.__create_item(etime, summary, location, categs)
+- self.__vbox.pack_start(item, gtk.FALSE, gtk.FALSE, 8)
++ self.__vbox.pack_start(item, False, False, 8)
+ #end for
+
+ # this does not resize the window to 10, 10 but to its minimal size
+diff -Nur gdeskcal-0.57.1/gdeskcal gdeskcal-0.57.2-kw/gdeskcal
+--- gdeskcal-0.57.1/gdeskcal 2004-03-15 23:46:05.000000000 +0100
++++ gdeskcal-0.57.2-kw/gdeskcal 2006-05-09 01:29:36.050150192 +0200
+@@ -103,4 +103,4 @@
+
+ dcal = CalMediator()
+
+-gtk.mainloop()
++gtk.main()