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 damn 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/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,9 @@
self.__objects[-1].add_event(event)
self.__objects.append(event)
- rrule = event.get_recurrences()
- event.set_recurrences(rrule)
+ # what??? why get and set same? -Kacper
+ rrule = event.get_recurrences()
+ # event.set_recurrences(rrule)
while (1):
l = lines.pop()
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()