almanah r120 - in trunk: . data src src/event-factories src/events
- From: pwithnall svn gnome org
- To: svn-commits-list gnome org
- Subject: almanah r120 - in trunk: . data src src/event-factories src/events
- Date: Sat, 13 Dec 2008 14:42:20 +0000 (UTC)
Author: pwithnall
Date: Sat Dec 13 14:42:19 2008
New Revision: 120
URL: http://svn.gnome.org/viewvc/almanah?rev=120&view=rev
Log:
2008-12-13 Philip Withnall <philip tecnocode co uk>
* data/almanah.ui:
* src/Makefile.am:
* src/event-factories/calendar.c
(almanah_calendar_event_factory_class_init),
(almanah_calendar_event_factory_init),
(almanah_calendar_event_factory_dispose), (query_events),
(events_changed_cb), (get_events):
* src/event-factories/calendar.h:
* src/event-factory.c (almanah_event_factory_class_init),
(almanah_event_factory_init),
(almanah_event_factory_get_property),
(almanah_event_factory_get_type_id),
(almanah_event_factory_query_events),
(almanah_event_factory_get_events):
* src/event-factory.h:
* src/event-manager.c (almanah_event_manager_class_init),
(almanah_event_manager_init), (almanah_event_manager_dispose),
(almanah_event_manager_new), (events_updated_cb),
(almanah_event_manager_query_events),
(almanah_event_manager_get_events):
* src/event-manager.h:
* src/event.c (almanah_event_class_init), (almanah_event_init),
(almanah_event_get_property), (almanah_event_format_value),
(almanah_event_view), (almanah_event_get_name),
(almanah_event_get_description), (almanah_event_get_icon_name):
* src/event.h:
* src/events/calendar-appointment.c
(almanah_calendar_appointment_event_class_init),
(almanah_calendar_appointment_event_init),
(almanah_calendar_appointment_event_finalize),
(almanah_calendar_appointment_event_new),
(almanah_calendar_appointment_event_format_value),
(almanah_calendar_appointment_event_view):
* src/events/calendar-appointment.h:
* src/events/calendar-task.c
(almanah_calendar_task_event_class_init),
(almanah_calendar_task_event_init),
(almanah_calendar_task_event_finalize),
(almanah_calendar_task_event_new),
(almanah_calendar_task_event_format_value),
(almanah_calendar_task_event_view):
* src/events/calendar-task.h:
* src/link-factory.c:
* src/link-factory.h:
* src/link-manager.c:
* src/link-manager.h:
* src/link.c:
* src/link.h:
* src/main-window.c (almanah_main_window_new),
(save_current_entry), (clear_factory_events),
(mw_events_updated_cb), (mw_calendar_day_selected_cb),
(mw_events_selection_changed_cb), (mw_events_value_data_cb),
(mw_events_tree_view_row_activated_cb),
(mw_view_button_clicked_cb):
* src/main.c (almanah_quit), (main):
* src/main.h:
* src/storage-manager.h: Renamed "links" to "events", a name
which
slightly better reflects what they are.
Added:
trunk/src/event-factories/ (props changed)
- copied from r119, /trunk/src/link-factories/
trunk/src/event-factory.c (contents, props changed)
- copied, changed from r119, /trunk/src/link-factory.c
trunk/src/event-factory.h (contents, props changed)
- copied, changed from r119, /trunk/src/link-factory.h
trunk/src/event-manager.c (contents, props changed)
- copied, changed from r119, /trunk/src/link-manager.c
trunk/src/event-manager.h (contents, props changed)
- copied, changed from r119, /trunk/src/link-manager.h
trunk/src/event.c (contents, props changed)
- copied, changed from r119, /trunk/src/link.c
trunk/src/event.h (contents, props changed)
- copied, changed from r119, /trunk/src/link.h
trunk/src/events/ (props changed)
- copied from r119, /trunk/src/links/
Removed:
trunk/src/link-factory.c
trunk/src/link-factory.h
trunk/src/link-manager.c
trunk/src/link-manager.h
trunk/src/link.c
trunk/src/link.h
Modified:
trunk/ChangeLog
trunk/data/almanah.ui
trunk/src/Makefile.am
trunk/src/event-factories/calendar.c
trunk/src/event-factories/calendar.h
trunk/src/events/calendar-appointment.c
trunk/src/events/calendar-appointment.h
trunk/src/events/calendar-task.c
trunk/src/events/calendar-task.h
trunk/src/main-window.c
trunk/src/main.c
trunk/src/main.h
trunk/src/storage-manager.h
Modified: trunk/data/almanah.ui
==============================================================================
--- trunk/data/almanah.ui (original)
+++ trunk/data/almanah.ui Sat Dec 13 14:42:19 2008
@@ -200,9 +200,9 @@
</ui>
</object>
- <object class="GtkListStore" id="dry_mw_link_store">
+ <object class="GtkListStore" id="dry_mw_event_store">
<columns>
- <column type="AlmanahLink"/><!-- Link object -->
+ <column type="AlmanahEvent"/><!-- Event object -->
<column type="gchararray"/><!-- Icon name -->
<column type="guint"/><!-- Factory type ID -->
</columns>
@@ -302,10 +302,10 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="dry_mw_attached_links_label">
+ <object class="GtkLabel" id="dry_mw_events_label">
<property name="label" translatable="yes">Past Events</property>
<accessibility>
- <relation target="dry_mw_links_tree_view" type="label-for"/>
+ <relation target="dry_mw_events_tree_view" type="label-for"/>
</accessibility>
</object>
<packing>
@@ -319,16 +319,16 @@
<property name="vscrollbar-policy">GTK_POLICY_AUTOMATIC</property>
<property name="shadow-type">GTK_SHADOW_IN</property>
<child>
- <object class="GtkTreeView" id="dry_mw_links_tree_view">
- <property name="model">dry_mw_link_store</property>
+ <object class="GtkTreeView" id="dry_mw_events_tree_view">
+ <property name="model">dry_mw_event_store</property>
<property name="can-focus">True</property>
<property name="headers-visible">False</property>
- <signal name="row-activated" handler="mw_links_tree_view_row_activated_cb"/>
+ <signal name="row-activated" handler="mw_events_tree_view_row_activated_cb"/>
<accessibility>
- <relation target="dry_mw_attached_links_label" type="labelled-by"/>
+ <relation target="dry_mw_events_label" type="labelled-by"/>
</accessibility>
<child internal-child="accessible">
- <object class="AtkObject" id="a11y-dry_mw_links_tree_view">
+ <object class="AtkObject" id="a11y-dry_mw_events_tree_view">
<property name="AtkObject::accessible-name" translatable="yes">Past Event List</property>
</object>
</child>
@@ -343,9 +343,9 @@
</object>
</child>
<child>
- <object class="GtkTreeViewColumn" id="dry_mw_link_value_column">
+ <object class="GtkTreeViewColumn" id="dry_mw_event_value_column">
<child>
- <object class="GtkCellRendererText" id="dry_mw_link_value_renderer"/>
+ <object class="GtkCellRendererText" id="dry_mw_event_value_renderer"/>
</child>
</object>
</child>
Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Sat Dec 13 14:42:19 2008
@@ -3,8 +3,8 @@
-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-I$(srcdir)/definitions \
- -I$(srcdir)/links \
- -I$(srcdir)/link-factories \
+ -I$(srcdir)/events \
+ -I$(srcdir)/event-factories \
$(STANDARD_CFLAGS) \
$(ENCRYPTION_CFLAGS) \
$(SPELL_CHECKING_CFLAGS)
@@ -24,8 +24,8 @@
almanah_SOURCES = \
definition-builtins.c \
definition-builtins.h \
- link-factory-builtins.c \
- link-factory-builtins.h \
+ event-factory-builtins.c \
+ event-factory-builtins.h \
main.c \
main.h \
interface.c \
@@ -42,12 +42,12 @@
printing.h \
entry.c \
entry.h \
- link.c \
- link.h \
- link-factory.c \
- link-factory.h \
- link-manager.c \
- link-manager.h \
+ event.c \
+ event.h \
+ event-factory.c \
+ event-factory.h \
+ event-manager.c \
+ event-manager.h \
definition.c \
definition.h \
definitions/file.c \
@@ -56,17 +56,17 @@
definitions/note.h \
definitions/uri.c \
definitions/uri.h \
- links/calendar-appointment.c \
- links/calendar-appointment.h \
- links/calendar-task.c \
- links/calendar-task.h \
- link-factories/calendar.c \
- link-factories/calendar.h \
- link-factories/calendar-client.c \
- link-factories/calendar-client.h \
- link-factories/calendar-debug.h \
- link-factories/calendar-sources.c \
- link-factories/calendar-sources.h
+ events/calendar-appointment.c \
+ events/calendar-appointment.h \
+ events/calendar-task.c \
+ events/calendar-task.h \
+ event-factories/calendar.c \
+ event-factories/calendar.h \
+ event-factories/calendar-client.c \
+ event-factories/calendar-client.h \
+ event-factories/calendar-debug.h \
+ event-factories/calendar-sources.c \
+ event-factories/calendar-sources.h
if ENCRYPTION
almanah_SOURCES += \
@@ -104,34 +104,34 @@
&& cp xgen-gtbc definition-builtins.c \
&& rm -f xgen-gtbc
-link-factory-builtins.h: stamp-link-factory-builtins.h
+event-factory-builtins.h: stamp-event-factory-builtins.h
@true
-stamp-link-factory-builtins.h: link-factory.h Makefile
+stamp-event-factory-builtins.h: event-factory.h Makefile
(cd $(srcdir) && $(GLIB_MKENUMS) \
- --fhead "#ifndef __ALMANAH_LINK_FACTORY_BUILTINS_H__\n#define __ALMANAH_LINK_FACTORY_BUILTINS_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
+ --fhead "#ifndef __ALMANAH_EVENT_FACTORY_BUILTINS_H__\n#define __ALMANAH_EVENT_FACTORY_BUILTINS_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
--fprod "/* enumerations from \"@filename \" */\n" \
--vhead "GType @enum_name _get_type (void) G_GNUC_CONST;\n#define ALMANAH_TYPE_ ENUMSHORT@ (@enum_name _get_type())\n" \
- --ftail "G_END_DECLS\n\n#endif /* __ALMANAH_LINK_FACTORY_BUILTINS_H__ */" link-factory.h) >> xgen-gtbh \
- && (cmp -s xgen-gtbh link-factory-builtins.h || cp xgen-gtbh link-factory-builtins.h ) \
+ --ftail "G_END_DECLS\n\n#endif /* __ALMANAH_EVENT_FACTORY_BUILTINS_H__ */" event-factory.h) >> xgen-gtbh \
+ && (cmp -s xgen-gtbh event-factory-builtins.h || cp xgen-gtbh event-factory-builtins.h ) \
&& rm -f xgen-gtbh \
&& echo timestamp > $(@F)
-link-factory-builtins.c: link-factory.h Makefile link-factory-builtins.h
+event-factory-builtins.c: event-factory.h Makefile event-factory-builtins.h
(cd $(srcdir) && $(GLIB_MKENUMS) \
- --fhead "#include \"link-factory.h\"\n#include \"link-factory-builtins.h\"" \
+ --fhead "#include \"event-factory.h\"\n#include \"event-factory-builtins.h\"" \
--fprod "\n/* enumerations from \"@filename \" */" \
--vhead "GType\n enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G Type@Value values[] = {" \
--vprod " { @VALUENAME@, \"@VALUENAME \", \"@valuenick \" }," \
--vtail " { 0, NULL, NULL }\n };\n etype = g_ type@_register_static (\"@EnumName \", values);\n }\n return etype;\n}\n" \
- link-factory.h ) > xgen-gtbc \
- && cp xgen-gtbc link-factory-builtins.c \
+ event-factory.h ) > xgen-gtbc \
+ && cp xgen-gtbc event-factory-builtins.c \
&& rm -f xgen-gtbc
CLEANFILES = \
definition-builtins.h \
definition-builtins.c \
stamp-definition-builtins.h \
- link-factory-builtins.h \
- link-factory-builtins.c \
- stamp-link-factory-builtins.h
+ event-factory-builtins.h \
+ event-factory-builtins.c \
+ stamp-event-factory-builtins.h
Modified: trunk/src/event-factories/calendar.c
==============================================================================
--- /trunk/src/link-factories/calendar.c (original)
+++ trunk/src/event-factories/calendar.c Sat Dec 13 14:42:19 2008
@@ -19,45 +19,45 @@
#include <glib.h>
-#include "../link.h"
+#include "../event.h"
#include "calendar.h"
#include "calendar-client.h"
-#include "../link-factory.h"
-#include "../links/calendar-appointment.h"
-#include "../links/calendar-task.h"
-
-static void almanah_calendar_link_factory_init (AlmanahCalendarLinkFactory *self);
-static void almanah_calendar_link_factory_dispose (GObject *object);
-static void query_links (AlmanahLinkFactory *link_factory, GDate *date);
-static GSList *get_links (AlmanahLinkFactory *link_factory, GDate *date);
-static void events_changed_cb (CalendarClient *client, AlmanahCalendarLinkFactory *self);
+#include "../event-factory.h"
+#include "../events/calendar-appointment.h"
+#include "../events/calendar-task.h"
+
+static void almanah_calendar_event_factory_init (AlmanahCalendarEventFactory *self);
+static void almanah_calendar_event_factory_dispose (GObject *object);
+static void query_events (AlmanahEventFactory *event_factory, GDate *date);
+static GSList *get_events (AlmanahEventFactory *event_factory, GDate *date);
+static void events_changed_cb (CalendarClient *client, AlmanahCalendarEventFactory *self);
-struct _AlmanahCalendarLinkFactoryPrivate {
+struct _AlmanahCalendarEventFactoryPrivate {
CalendarClient *client;
};
-G_DEFINE_TYPE (AlmanahCalendarLinkFactory, almanah_calendar_link_factory, ALMANAH_TYPE_LINK_FACTORY)
-#define ALMANAH_CALENDAR_LINK_FACTORY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ALMANAH_TYPE_CALENDAR_LINK_FACTORY, AlmanahCalendarLinkFactoryPrivate))
+G_DEFINE_TYPE (AlmanahCalendarEventFactory, almanah_calendar_event_factory, ALMANAH_TYPE_EVENT_FACTORY)
+#define ALMANAH_CALENDAR_EVENT_FACTORY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ALMANAH_TYPE_CALENDAR_EVENT_FACTORY, AlmanahCalendarEventFactoryPrivate))
static void
-almanah_calendar_link_factory_class_init (AlmanahCalendarLinkFactoryClass *klass)
+almanah_calendar_event_factory_class_init (AlmanahCalendarEventFactoryClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- AlmanahLinkFactoryClass *link_factory_class = ALMANAH_LINK_FACTORY_CLASS (klass);
+ AlmanahEventFactoryClass *event_factory_class = ALMANAH_EVENT_FACTORY_CLASS (klass);
- g_type_class_add_private (klass, sizeof (AlmanahCalendarLinkFactoryPrivate));
+ g_type_class_add_private (klass, sizeof (AlmanahCalendarEventFactoryPrivate));
- gobject_class->dispose = almanah_calendar_link_factory_dispose;
+ gobject_class->dispose = almanah_calendar_event_factory_dispose;
- link_factory_class->type_id = ALMANAH_LINK_FACTORY_CALENDAR;
- link_factory_class->query_links = query_links;
- link_factory_class->get_links = get_links;
+ event_factory_class->type_id = ALMANAH_EVENT_FACTORY_CALENDAR;
+ event_factory_class->query_events = query_events;
+ event_factory_class->get_events = get_events;
}
static void
-almanah_calendar_link_factory_init (AlmanahCalendarLinkFactory *self)
+almanah_calendar_event_factory_init (AlmanahCalendarEventFactory *self)
{
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, ALMANAH_TYPE_CALENDAR_LINK_FACTORY, AlmanahCalendarLinkFactoryPrivate);
+ self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, ALMANAH_TYPE_CALENDAR_EVENT_FACTORY, AlmanahCalendarEventFactoryPrivate);
self->priv->client = calendar_client_new ();
g_signal_connect (self->priv->client, "tasks-changed", G_CALLBACK (events_changed_cb), self);
@@ -65,32 +65,32 @@
}
static void
-almanah_calendar_link_factory_dispose (GObject *object)
+almanah_calendar_event_factory_dispose (GObject *object)
{
- AlmanahCalendarLinkFactoryPrivate *priv = ALMANAH_CALENDAR_LINK_FACTORY_GET_PRIVATE (object);
+ AlmanahCalendarEventFactoryPrivate *priv = ALMANAH_CALENDAR_EVENT_FACTORY_GET_PRIVATE (object);
if (priv->client != NULL)
g_object_unref (priv->client);
priv->client = NULL;
/* Chain up to the parent class */
- G_OBJECT_CLASS (almanah_calendar_link_factory_parent_class)->dispose (object);
+ G_OBJECT_CLASS (almanah_calendar_event_factory_parent_class)->dispose (object);
}
static void
-query_links (AlmanahLinkFactory *link_factory, GDate *date)
+query_events (AlmanahEventFactory *event_factory, GDate *date)
{
- AlmanahCalendarLinkFactory *self = ALMANAH_CALENDAR_LINK_FACTORY (link_factory);
+ AlmanahCalendarEventFactory *self = ALMANAH_CALENDAR_EVENT_FACTORY (event_factory);
calendar_client_select_day (self->priv->client, g_date_get_day (date));
calendar_client_select_month (self->priv->client, g_date_get_month (date) - 1, g_date_get_year (date));
- g_signal_emit_by_name (self, "links-updated");
+ g_signal_emit_by_name (self, "events-updated");
}
static void
-events_changed_cb (CalendarClient *client, AlmanahCalendarLinkFactory *self)
+events_changed_cb (CalendarClient *client, AlmanahCalendarEventFactory *self)
{
- g_signal_emit_by_name (self, "links-updated");
+ g_signal_emit_by_name (self, "events-updated");
}
static inline GTime
@@ -107,19 +107,19 @@
}
static GSList *
-get_links (AlmanahLinkFactory *link_factory, GDate *date)
+get_events (AlmanahEventFactory *event_factory, GDate *date)
{
- GSList *events, *e, *links = NULL;
- AlmanahCalendarLinkFactoryPrivate *priv = ALMANAH_CALENDAR_LINK_FACTORY_GET_PRIVATE (link_factory);
+ GSList *calendar_events, *e, *events = NULL;
+ AlmanahCalendarEventFactoryPrivate *priv = ALMANAH_CALENDAR_EVENT_FACTORY_GET_PRIVATE (event_factory);
- events = calendar_client_get_events (priv->client, CALENDAR_EVENT_ALL);
+ calendar_events = calendar_client_get_events (priv->client, CALENDAR_EVENT_ALL);
- for (e = events; e != NULL; e = g_slist_next (e)) {
- CalendarEvent *event = e->data;
- AlmanahLink *link;
+ for (e = calendar_events; e != NULL; e = g_slist_next (e)) {
+ CalendarEvent *calendar_event = e->data;
+ AlmanahEvent *event;
- /* Create a new link and use it to replace the CalendarEvent */
- if (event->type == CALENDAR_EVENT_TASK) {
+ /* Create a new event and use it to replace the CalendarEvent */
+ if (calendar_event->type == CALENDAR_EVENT_TASK) {
/* Task */
GTime today_time, yesterday_time;
@@ -127,23 +127,23 @@
yesterday_time = today_time - (24 * 60 * 60);
/* Have to filter out tasks by date */
- if (event->event.task.start_time <= today_time &&
- (event->event.task.completed_time == 0 || event->event.task.completed_time >= yesterday_time)) {
- link = ALMANAH_LINK (almanah_calendar_task_link_new (event->event.task.uid, event->event.task.summary));
+ if (calendar_event->event.task.start_time <= today_time &&
+ (calendar_event->event.task.completed_time == 0 || calendar_event->event.task.completed_time >= yesterday_time)) {
+ event = ALMANAH_EVENT (almanah_calendar_task_event_new (calendar_event->event.task.uid, calendar_event->event.task.summary));
} else {
- link = NULL;
+ event = NULL;
}
} else {
/* Appointment */
- link = ALMANAH_LINK (almanah_calendar_appointment_link_new (event->event.appointment.summary, event->event.appointment.start_time));
+ event = ALMANAH_EVENT (almanah_calendar_appointment_event_new (calendar_event->event.appointment.summary, calendar_event->event.appointment.start_time));
}
- if (link != NULL)
- links = g_slist_prepend (links, link);
+ if (event != NULL)
+ events = g_slist_prepend (events, event);
- calendar_event_free (event);
+ calendar_event_free (calendar_event);
}
- g_slist_free (events);
+ g_slist_free (calendar_events);
- return links;
+ return events;
}
Modified: trunk/src/event-factories/calendar.h
==============================================================================
--- /trunk/src/link-factories/calendar.h (original)
+++ trunk/src/event-factories/calendar.h Sat Dec 13 14:42:19 2008
@@ -17,36 +17,36 @@
* along with Almanah. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef ALMANAH_CALENDAR_LINK_FACTORY_H
-#define ALMANAH_CALENDAR_LINK_FACTORY_H
+#ifndef ALMANAH_CALENDAR_EVENT_FACTORY_H
+#define ALMANAH_CALENDAR_EVENT_FACTORY_H
#include <glib.h>
#include <glib-object.h>
-#include "../link-factory.h"
+#include "../event-factory.h"
G_BEGIN_DECLS
-#define ALMANAH_TYPE_CALENDAR_LINK_FACTORY (almanah_calendar_link_factory_get_type ())
-#define ALMANAH_CALENDAR_LINK_FACTORY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), ALMANAH_TYPE_CALENDAR_LINK_FACTORY, AlmanahCalendarLinkFactory))
-#define ALMANAH_CALENDAR_LINK_FACTORY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), ALMANAH_TYPE_CALENDAR_LINK_FACTORY, AlmanahCalendarLinkFactoryClass))
-#define ALMANAH_IS_CALENDAR_LINK_FACTORY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), ALMANAH_TYPE_CALENDAR_LINK_FACTORY))
-#define ALMANAH_IS_CALENDAR_LINK_FACTORY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), ALMANAH_TYPE_CALENDAR_LINK_FACTORY))
-#define ALMANAH_CALENDAR_LINK_FACTORY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), ALMANAH_TYPE_CALENDAR_LINK_FACTORY, AlmanahCalendarLinkFactoryClass))
+#define ALMANAH_TYPE_CALENDAR_EVENT_FACTORY (almanah_calendar_event_factory_get_type ())
+#define ALMANAH_CALENDAR_EVENT_FACTORY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), ALMANAH_TYPE_CALENDAR_EVENT_FACTORY, AlmanahCalendarEventFactory))
+#define ALMANAH_CALENDAR_EVENT_FACTORY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), ALMANAH_TYPE_CALENDAR_EVENT_FACTORY, AlmanahCalendarEventFactoryClass))
+#define ALMANAH_IS_CALENDAR_EVENT_FACTORY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), ALMANAH_TYPE_CALENDAR_EVENT_FACTORY))
+#define ALMANAH_IS_CALENDAR_EVENT_FACTORY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), ALMANAH_TYPE_CALENDAR_EVENT_FACTORY))
+#define ALMANAH_CALENDAR_EVENT_FACTORY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), ALMANAH_TYPE_CALENDAR_EVENT_FACTORY, AlmanahCalendarEventFactoryClass))
-typedef struct _AlmanahCalendarLinkFactoryPrivate AlmanahCalendarLinkFactoryPrivate;
+typedef struct _AlmanahCalendarEventFactoryPrivate AlmanahCalendarEventFactoryPrivate;
typedef struct {
- AlmanahLinkFactory parent;
- AlmanahCalendarLinkFactoryPrivate *priv;
-} AlmanahCalendarLinkFactory;
+ AlmanahEventFactory parent;
+ AlmanahCalendarEventFactoryPrivate *priv;
+} AlmanahCalendarEventFactory;
typedef struct {
- AlmanahLinkFactoryClass parent;
-} AlmanahCalendarLinkFactoryClass;
+ AlmanahEventFactoryClass parent;
+} AlmanahCalendarEventFactoryClass;
-GType almanah_calendar_link_factory_get_type (void);
+GType almanah_calendar_event_factory_get_type (void);
G_END_DECLS
-#endif /* !ALMANAH_CALENDAR_LINK_FACTORY_H */
+#endif /* !ALMANAH_CALENDAR_EVENT_FACTORY_H */
Copied: trunk/src/event-factory.c (from r119, /trunk/src/link-factory.c)
==============================================================================
--- /trunk/src/link-factory.c (original)
+++ trunk/src/event-factory.c Sat Dec 13 14:42:19 2008
@@ -19,13 +19,13 @@
#include <glib.h>
-#include "link-factory.h"
-#include "link-factory-builtins.h"
+#include "event-factory.h"
+#include "event-factory-builtins.h"
-static void almanah_link_factory_init (AlmanahLinkFactory *self);
-static void almanah_link_factory_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec);
+static void almanah_event_factory_init (AlmanahEventFactory *self);
+static void almanah_event_factory_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec);
-struct _AlmanahLinkFactoryPrivate {
+struct _AlmanahEventFactoryPrivate {
GDate date;
};
@@ -34,31 +34,31 @@
};
enum {
- SIGNAL_LINKS_UPDATED,
+ SIGNAL_EVENTS_UPDATED,
LAST_SIGNAL
};
-static guint link_factory_signals[LAST_SIGNAL] = { 0, };
+static guint event_factory_signals[LAST_SIGNAL] = { 0, };
-G_DEFINE_ABSTRACT_TYPE (AlmanahLinkFactory, almanah_link_factory, G_TYPE_OBJECT)
-#define ALMANAH_LINK_FACTORY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ALMANAH_TYPE_LINK_FACTORY, AlmanahLinkFactoryPrivate))
+G_DEFINE_ABSTRACT_TYPE (AlmanahEventFactory, almanah_event_factory, G_TYPE_OBJECT)
+#define ALMANAH_EVENT_FACTORY_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ALMANAH_TYPE_EVENT_FACTORY, AlmanahEventFactoryPrivate))
static void
-almanah_link_factory_class_init (AlmanahLinkFactoryClass *klass)
+almanah_event_factory_class_init (AlmanahEventFactoryClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- g_type_class_add_private (klass, sizeof (AlmanahLinkFactoryPrivate));
+ g_type_class_add_private (klass, sizeof (AlmanahEventFactoryPrivate));
- gobject_class->get_property = almanah_link_factory_get_property;
+ gobject_class->get_property = almanah_event_factory_get_property;
g_object_class_install_property (gobject_class, PROP_TYPE_ID,
g_param_spec_enum ("type-id",
- "Type ID", "The type ID of this link factory.",
- ALMANAH_TYPE_LINK_FACTORY_TYPE, ALMANAH_LINK_FACTORY_UNKNOWN,
+ "Type ID", "The type ID of this event factory.",
+ ALMANAH_TYPE_EVENT_FACTORY_TYPE, ALMANAH_EVENT_FACTORY_UNKNOWN,
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
- link_factory_signals[SIGNAL_LINKS_UPDATED] = g_signal_new ("links-updated",
+ event_factory_signals[SIGNAL_EVENTS_UPDATED] = g_signal_new ("events-updated",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
0, NULL, NULL,
@@ -67,15 +67,15 @@
}
static void
-almanah_link_factory_init (AlmanahLinkFactory *self)
+almanah_event_factory_init (AlmanahEventFactory *self)
{
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, ALMANAH_TYPE_LINK_FACTORY, AlmanahLinkFactoryPrivate);
+ self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, ALMANAH_TYPE_EVENT_FACTORY, AlmanahEventFactoryPrivate);
}
static void
-almanah_link_factory_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
+almanah_event_factory_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
{
- AlmanahLinkFactoryClass *klass = ALMANAH_LINK_FACTORY_GET_CLASS (object);
+ AlmanahEventFactoryClass *klass = ALMANAH_EVENT_FACTORY_GET_CLASS (object);
switch (property_id) {
case PROP_TYPE_ID:
@@ -88,25 +88,25 @@
}
}
-AlmanahLinkFactoryType
-almanah_link_factory_get_type_id (AlmanahLinkFactory *self)
+AlmanahEventFactoryType
+almanah_event_factory_get_type_id (AlmanahEventFactory *self)
{
- AlmanahLinkFactoryClass *klass = ALMANAH_LINK_FACTORY_GET_CLASS (self);
+ AlmanahEventFactoryClass *klass = ALMANAH_EVENT_FACTORY_GET_CLASS (self);
return klass->type_id;
}
void
-almanah_link_factory_query_links (AlmanahLinkFactory *self, GDate *date)
+almanah_event_factory_query_events (AlmanahEventFactory *self, GDate *date)
{
- AlmanahLinkFactoryClass *klass = ALMANAH_LINK_FACTORY_GET_CLASS (self);
- g_assert (klass->query_links != NULL);
- return klass->query_links (self, date);
+ AlmanahEventFactoryClass *klass = ALMANAH_EVENT_FACTORY_GET_CLASS (self);
+ g_assert (klass->query_events != NULL);
+ return klass->query_events (self, date);
}
GSList *
-almanah_link_factory_get_links (AlmanahLinkFactory *self, GDate *date)
+almanah_event_factory_get_events (AlmanahEventFactory *self, GDate *date)
{
- AlmanahLinkFactoryClass *klass = ALMANAH_LINK_FACTORY_GET_CLASS (self);
- g_assert (klass->get_links != NULL);
- return klass->get_links (self, date);
+ AlmanahEventFactoryClass *klass = ALMANAH_EVENT_FACTORY_GET_CLASS (self);
+ g_assert (klass->get_events != NULL);
+ return klass->get_events (self, date);
}
Copied: trunk/src/event-factory.h (from r119, /trunk/src/link-factory.h)
==============================================================================
--- /trunk/src/link-factory.h (original)
+++ trunk/src/event-factory.h Sat Dec 13 14:42:19 2008
@@ -17,8 +17,8 @@
* along with Almanah. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef ALMANAH_LINK_FACTORY_H
-#define ALMANAH_LINK_FACTORY_H
+#ifndef ALMANAH_EVENT_FACTORY_H
+#define ALMANAH_EVENT_FACTORY_H
#include <glib.h>
#include <glib-object.h>
@@ -26,40 +26,40 @@
G_BEGIN_DECLS
typedef enum {
- ALMANAH_LINK_FACTORY_UNKNOWN = 0,
- ALMANAH_LINK_FACTORY_CALENDAR = 1
-} AlmanahLinkFactoryType;
-
-#define ALMANAH_TYPE_LINK_FACTORY (almanah_link_factory_get_type ())
-#define ALMANAH_LINK_FACTORY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), ALMANAH_TYPE_LINK_FACTORY, AlmanahLinkFactory))
-#define ALMANAH_LINK_FACTORY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), ALMANAH_TYPE_LINK_FACTORY, AlmanahLinkFactoryClass))
-#define ALMANAH_IS_LINK_FACTORY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), ALMANAH_TYPE_LINK_FACTORY))
-#define ALMANAH_IS_LINK_FACTORY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), ALMANAH_TYPE_LINK_FACTORY))
-#define ALMANAH_LINK_FACTORY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), ALMANAH_TYPE_LINK_FACTORY, AlmanahLinkFactoryClass))
+ ALMANAH_EVENT_FACTORY_UNKNOWN = 0,
+ ALMANAH_EVENT_FACTORY_CALENDAR = 1
+} AlmanahEventFactoryType;
+
+#define ALMANAH_TYPE_EVENT_FACTORY (almanah_event_factory_get_type ())
+#define ALMANAH_EVENT_FACTORY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), ALMANAH_TYPE_EVENT_FACTORY, AlmanahEventFactory))
+#define ALMANAH_EVENT_FACTORY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), ALMANAH_TYPE_EVENT_FACTORY, AlmanahEventFactoryClass))
+#define ALMANAH_IS_EVENT_FACTORY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), ALMANAH_TYPE_EVENT_FACTORY))
+#define ALMANAH_IS_EVENT_FACTORY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), ALMANAH_TYPE_EVENT_FACTORY))
+#define ALMANAH_EVENT_FACTORY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), ALMANAH_TYPE_EVENT_FACTORY, AlmanahEventFactoryClass))
-typedef struct _AlmanahLinkFactoryPrivate AlmanahLinkFactoryPrivate;
+typedef struct _AlmanahEventFactoryPrivate AlmanahEventFactoryPrivate;
typedef struct {
GObject parent;
- AlmanahLinkFactoryPrivate *priv;
-} AlmanahLinkFactory;
+ AlmanahEventFactoryPrivate *priv;
+} AlmanahEventFactory;
typedef struct {
GObjectClass parent;
- AlmanahLinkFactoryType type_id;
+ AlmanahEventFactoryType type_id;
- void (*query_links) (AlmanahLinkFactory *link_factory, GDate *date);
- GSList *(*get_links) (AlmanahLinkFactory *link_factory, GDate *date);
-} AlmanahLinkFactoryClass;
+ void (*query_events) (AlmanahEventFactory *event_factory, GDate *date);
+ GSList *(*get_events) (AlmanahEventFactory *event_factory, GDate *date);
+} AlmanahEventFactoryClass;
-GType almanah_link_factory_get_type (void);
+GType almanah_event_factory_get_type (void);
-AlmanahLinkFactoryType almanah_link_factory_get_type_id (AlmanahLinkFactory *self);
+AlmanahEventFactoryType almanah_event_factory_get_type_id (AlmanahEventFactory *self);
-void almanah_link_factory_query_links (AlmanahLinkFactory *self, GDate *date);
-GSList *almanah_link_factory_get_links (AlmanahLinkFactory *self, GDate *date);
+void almanah_event_factory_query_events (AlmanahEventFactory *self, GDate *date);
+GSList *almanah_event_factory_get_events (AlmanahEventFactory *self, GDate *date);
G_END_DECLS
-#endif /* !ALMANAH_LINK_FACTORY_H */
+#endif /* !ALMANAH_EVENT_FACTORY_H */
Copied: trunk/src/event-manager.c (from r119, /trunk/src/link-manager.c)
==============================================================================
--- /trunk/src/link-manager.c (original)
+++ trunk/src/event-manager.c Sat Dec 13 14:42:19 2008
@@ -19,80 +19,80 @@
#include <glib.h>
-#include "link-manager.h"
-#include "link-factory.h"
-#include "link-factory-builtins.h"
+#include "event-manager.h"
+#include "event-factory.h"
+#include "event-factory-builtins.h"
typedef struct {
- AlmanahLinkFactoryType type_id;
+ AlmanahEventFactoryType type_id;
GType (*type_function) (void);
-} LinkFactoryType;
+} EventFactoryType;
/* TODO: This is still a little hacky */
#include "calendar.h"
#include "main.h"
-const LinkFactoryType link_factory_types[] = {
- { ALMANAH_LINK_FACTORY_CALENDAR, almanah_calendar_link_factory_get_type }
+const EventFactoryType event_factory_types[] = {
+ { ALMANAH_EVENT_FACTORY_CALENDAR, almanah_calendar_event_factory_get_type }
};
-static void almanah_link_manager_init (AlmanahLinkManager *self);
-static void almanah_link_manager_dispose (GObject *object);
-static void links_updated_cb (AlmanahLinkFactory *factory, AlmanahLinkManager *self);
+static void almanah_event_manager_init (AlmanahEventManager *self);
+static void almanah_event_manager_dispose (GObject *object);
+static void events_updated_cb (AlmanahEventFactory *factory, AlmanahEventManager *self);
-struct _AlmanahLinkManagerPrivate {
- AlmanahLinkFactory **factories;
+struct _AlmanahEventManagerPrivate {
+ AlmanahEventFactory **factories;
};
enum {
- SIGNAL_LINKS_UPDATED,
+ SIGNAL_EVENTS_UPDATED,
LAST_SIGNAL
};
-static guint link_manager_signals[LAST_SIGNAL] = { 0, };
+static guint event_manager_signals[LAST_SIGNAL] = { 0, };
-G_DEFINE_TYPE (AlmanahLinkManager, almanah_link_manager, G_TYPE_OBJECT)
-#define ALMANAH_LINK_MANAGER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ALMANAH_TYPE_LINK_MANAGER, AlmanahLinkManagerPrivate))
+G_DEFINE_TYPE (AlmanahEventManager, almanah_event_manager, G_TYPE_OBJECT)
+#define ALMANAH_EVENT_MANAGER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ALMANAH_TYPE_EVENT_MANAGER, AlmanahEventManagerPrivate))
static void
-almanah_link_manager_class_init (AlmanahLinkManagerClass *klass)
+almanah_event_manager_class_init (AlmanahEventManagerClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- g_type_class_add_private (klass, sizeof (AlmanahLinkManagerPrivate));
+ g_type_class_add_private (klass, sizeof (AlmanahEventManagerPrivate));
- gobject_class->dispose = almanah_link_manager_dispose;
+ gobject_class->dispose = almanah_event_manager_dispose;
- link_manager_signals[SIGNAL_LINKS_UPDATED] = g_signal_new ("links-updated",
+ event_manager_signals[SIGNAL_EVENTS_UPDATED] = g_signal_new ("events-updated",
G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST,
0, NULL, NULL,
g_cclosure_marshal_VOID__ENUM,
- G_TYPE_NONE, 1, ALMANAH_TYPE_LINK_FACTORY_TYPE);
+ G_TYPE_NONE, 1, ALMANAH_TYPE_EVENT_FACTORY_TYPE);
}
static void
-almanah_link_manager_init (AlmanahLinkManager *self)
+almanah_event_manager_init (AlmanahEventManager *self)
{
guint i;
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, ALMANAH_TYPE_LINK_MANAGER, AlmanahLinkManagerPrivate);
+ self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, ALMANAH_TYPE_EVENT_MANAGER, AlmanahEventManagerPrivate);
- /* Set up the list of AlmanahLinkFactories */
- self->priv->factories = g_new (AlmanahLinkFactory*, G_N_ELEMENTS (link_factory_types) + 1);
- for (i = 0; i < G_N_ELEMENTS (link_factory_types); i++) {
- self->priv->factories[i] = g_object_new (link_factory_types[i].type_function (), NULL);
- g_signal_connect (self->priv->factories[i], "links-updated", G_CALLBACK (links_updated_cb), self);
+ /* Set up the list of AlmanahEventFactories */
+ self->priv->factories = g_new (AlmanahEventFactory*, G_N_ELEMENTS (event_factory_types) + 1);
+ for (i = 0; i < G_N_ELEMENTS (event_factory_types); i++) {
+ self->priv->factories[i] = g_object_new (event_factory_types[i].type_function (), NULL);
+ g_signal_connect (self->priv->factories[i], "events-updated", G_CALLBACK (events_updated_cb), self);
}
self->priv->factories[i] = NULL;
}
static void
-almanah_link_manager_dispose (GObject *object)
+almanah_event_manager_dispose (GObject *object)
{
guint i = 0;
- AlmanahLinkManagerPrivate *priv = ALMANAH_LINK_MANAGER_GET_PRIVATE (object);
+ AlmanahEventManagerPrivate *priv = ALMANAH_EVENT_MANAGER_GET_PRIVATE (object);
/* Free the factories */
if (priv->factories != NULL) {
@@ -103,35 +103,35 @@
priv->factories = NULL;
/* Chain up to the parent class */
- G_OBJECT_CLASS (almanah_link_manager_parent_class)->dispose (object);
+ G_OBJECT_CLASS (almanah_event_manager_parent_class)->dispose (object);
}
-AlmanahLinkManager *
-almanah_link_manager_new (void)
+AlmanahEventManager *
+almanah_event_manager_new (void)
{
- return g_object_new (ALMANAH_TYPE_LINK_MANAGER, NULL);
+ return g_object_new (ALMANAH_TYPE_EVENT_MANAGER, NULL);
}
static void
-links_updated_cb (AlmanahLinkFactory *factory, AlmanahLinkManager *self)
+events_updated_cb (AlmanahEventFactory *factory, AlmanahEventManager *self)
{
- g_signal_emit (self, link_manager_signals[SIGNAL_LINKS_UPDATED], 0, almanah_link_factory_get_type_id (factory));
+ g_signal_emit (self, event_manager_signals[SIGNAL_EVENTS_UPDATED], 0, almanah_event_factory_get_type_id (factory));
}
void
-almanah_link_manager_query_links (AlmanahLinkManager *self, AlmanahLinkFactoryType type_id, GDate *date)
+almanah_event_manager_query_events (AlmanahEventManager *self, AlmanahEventFactoryType type_id, GDate *date)
{
- AlmanahLinkManagerPrivate *priv = ALMANAH_LINK_MANAGER_GET_PRIVATE (self);
+ AlmanahEventManagerPrivate *priv = ALMANAH_EVENT_MANAGER_GET_PRIVATE (self);
guint i;
if (almanah->debug == TRUE)
- g_debug ("almanah_link_manager_query_links called for factory %u and date %u-%u-%u.", type_id, g_date_get_year (date), g_date_get_month (date), g_date_get_day (date));
+ g_debug ("almanah_event_manager_query_events called for factory %u and date %u-%u-%u.", type_id, g_date_get_year (date), g_date_get_month (date), g_date_get_day (date));
- if (type_id != ALMANAH_LINK_FACTORY_UNKNOWN) {
+ if (type_id != ALMANAH_EVENT_FACTORY_UNKNOWN) {
/* Just query that factory */
for (i = 0; priv->factories[i] != NULL; i++) {
- if (almanah_link_factory_get_type_id (priv->factories[i]) == type_id)
- almanah_link_factory_query_links (priv->factories[i], date);
+ if (almanah_event_factory_get_type_id (priv->factories[i]) == type_id)
+ almanah_event_factory_query_events (priv->factories[i], date);
}
return;
@@ -139,34 +139,34 @@
/* Otherwise, query all factories */
for (i = 0; priv->factories[i] != NULL; i++)
- almanah_link_factory_query_links (priv->factories[i], date);
+ almanah_event_factory_query_events (priv->factories[i], date);
}
GSList *
-almanah_link_manager_get_links (AlmanahLinkManager *self, AlmanahLinkFactoryType type_id, GDate *date)
+almanah_event_manager_get_events (AlmanahEventManager *self, AlmanahEventFactoryType type_id, GDate *date)
{
- AlmanahLinkManagerPrivate *priv = ALMANAH_LINK_MANAGER_GET_PRIVATE (self);
+ AlmanahEventManagerPrivate *priv = ALMANAH_EVENT_MANAGER_GET_PRIVATE (self);
GSList *list = NULL, *end = NULL;
guint i;
if (almanah->debug == TRUE)
- g_debug ("almanah_link_manager_get_links called for factory %u and date %u-%u-%u.", type_id, g_date_get_year (date), g_date_get_month (date), g_date_get_day (date));
+ g_debug ("almanah_event_manager_get_events called for factory %u and date %u-%u-%u.", type_id, g_date_get_year (date), g_date_get_month (date), g_date_get_day (date));
- if (type_id != ALMANAH_LINK_FACTORY_UNKNOWN) {
- /* Just return the links for the specified link factory */
+ if (type_id != ALMANAH_EVENT_FACTORY_UNKNOWN) {
+ /* Just return the events for the specified event factory */
for (i = 0; priv->factories[i] != NULL; i++) {
- if (almanah_link_factory_get_type_id (priv->factories[i]) == type_id)
- return almanah_link_factory_get_links (priv->factories[i], date);
+ if (almanah_event_factory_get_type_id (priv->factories[i]) == type_id)
+ return almanah_event_factory_get_events (priv->factories[i], date);
}
return NULL;
}
- /* Otherwise, return a concatenation of all factories' links */
+ /* Otherwise, return a concatenation of all factories' events */
for (i = 0; priv->factories[i] != NULL; i++) {
GSList *end2;
- end2 = almanah_link_factory_get_links (priv->factories[i], date);
+ end2 = almanah_event_factory_get_events (priv->factories[i], date);
end = g_slist_concat (end, end2); /* assignment's only to shut gcc up */
end = end2;
Copied: trunk/src/event-manager.h (from r119, /trunk/src/link-manager.h)
==============================================================================
--- /trunk/src/link-manager.h (original)
+++ trunk/src/event-manager.h Sat Dec 13 14:42:19 2008
@@ -17,41 +17,41 @@
* along with Almanah. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef ALMANAH_LINK_MANAGER_H
-#define ALMANAH_LINK_MANAGER_H
+#ifndef ALMANAH_EVENT_MANAGER_H
+#define ALMANAH_EVENT_MANAGER_H
#include <glib.h>
#include <glib-object.h>
-#include "link-factory.h"
+#include "event-factory.h"
G_BEGIN_DECLS
-#define ALMANAH_TYPE_LINK_MANAGER (almanah_link_manager_get_type ())
-#define ALMANAH_LINK_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), ALMANAH_TYPE_LINK_MANAGER, AlmanahLinkManager))
-#define ALMANAH_LINK_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), ALMANAH_TYPE_LINK_MANAGER, AlmanahLinkManagerClass))
-#define ALMANAH_IS_LINK_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), ALMANAH_TYPE_LINK_MANAGER))
-#define ALMANAH_IS_LINK_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), ALMANAH_TYPE_LINK_MANAGER))
-#define ALMANAH_LINK_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), ALMANAH_TYPE_LINK_MANAGER, AlmanahLinkManagerClass))
+#define ALMANAH_TYPE_EVENT_MANAGER (almanah_event_manager_get_type ())
+#define ALMANAH_EVENT_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), ALMANAH_TYPE_EVENT_MANAGER, AlmanahEventManager))
+#define ALMANAH_EVENT_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), ALMANAH_TYPE_EVENT_MANAGER, AlmanahEventManagerClass))
+#define ALMANAH_IS_EVENT_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), ALMANAH_TYPE_EVENT_MANAGER))
+#define ALMANAH_IS_EVENT_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), ALMANAH_TYPE_EVENT_MANAGER))
+#define ALMANAH_EVENT_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), ALMANAH_TYPE_EVENT_MANAGER, AlmanahEventManagerClass))
-typedef struct _AlmanahLinkManagerPrivate AlmanahLinkManagerPrivate;
+typedef struct _AlmanahEventManagerPrivate AlmanahEventManagerPrivate;
typedef struct {
GObject parent;
- AlmanahLinkManagerPrivate *priv;
-} AlmanahLinkManager;
+ AlmanahEventManagerPrivate *priv;
+} AlmanahEventManager;
typedef struct {
GObjectClass parent;
-} AlmanahLinkManagerClass;
+} AlmanahEventManagerClass;
-GType almanah_link_manager_get_type (void);
+GType almanah_event_manager_get_type (void);
-AlmanahLinkManager *almanah_link_manager_new (void);
+AlmanahEventManager *almanah_event_manager_new (void);
-void almanah_link_manager_query_links (AlmanahLinkManager *self, AlmanahLinkFactoryType type_id, GDate *date);
-GSList *almanah_link_manager_get_links (AlmanahLinkManager *self, AlmanahLinkFactoryType type_id, GDate *date);
+void almanah_event_manager_query_events (AlmanahEventManager *self, AlmanahEventFactoryType type_id, GDate *date);
+GSList *almanah_event_manager_get_events (AlmanahEventManager *self, AlmanahEventFactoryType type_id, GDate *date);
G_END_DECLS
-#endif /* !ALMANAH_LINK_MANAGER_H */
+#endif /* !ALMANAH_EVENT_MANAGER_H */
Copied: trunk/src/event.c (from r119, /trunk/src/link.c)
==============================================================================
--- /trunk/src/link.c (original)
+++ trunk/src/event.c Sat Dec 13 14:42:19 2008
@@ -22,11 +22,11 @@
#include <math.h>
#include <string.h>
-#include "link.h"
+#include "event.h"
#include "main.h"
-static void almanah_link_init (AlmanahLink *self);
-static void almanah_link_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec);
+static void almanah_event_init (AlmanahEvent *self);
+static void almanah_event_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec);
enum {
PROP_NAME = 1,
@@ -34,42 +34,42 @@
PROP_ICON_NAME
};
-G_DEFINE_ABSTRACT_TYPE (AlmanahLink, almanah_link, G_TYPE_OBJECT)
-#define ALMANAH_LINK_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ALMANAH_TYPE_LINK, AlmanahLinkPrivate))
+G_DEFINE_ABSTRACT_TYPE (AlmanahEvent, almanah_event, G_TYPE_OBJECT)
+#define ALMANAH_EVENT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ALMANAH_TYPE_EVENT, AlmanahEventPrivate))
static void
-almanah_link_class_init (AlmanahLinkClass *klass)
+almanah_event_class_init (AlmanahEventClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->get_property = almanah_link_get_property;
+ gobject_class->get_property = almanah_event_get_property;
g_object_class_install_property (gobject_class, PROP_NAME,
g_param_spec_string ("name",
- "Name", "The human-readable name for this link type.",
+ "Name", "The human-readable name for this event type.",
NULL,
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, PROP_DESCRIPTION,
g_param_spec_string ("description",
- "Description", "The human-readable description for this link type.",
+ "Description", "The human-readable description for this event type.",
NULL,
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_property (gobject_class, PROP_ICON_NAME,
g_param_spec_string ("icon-name",
- "Icon Name", "The icon name for this link type.",
+ "Icon Name", "The icon name for this event type.",
NULL,
G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
}
static void
-almanah_link_init (AlmanahLink *self)
+almanah_event_init (AlmanahEvent *self)
{
}
static void
-almanah_link_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
+almanah_event_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
{
- AlmanahLinkClass *klass = ALMANAH_LINK_GET_CLASS (object);
+ AlmanahEventClass *klass = ALMANAH_EVENT_GET_CLASS (object);
switch (property_id) {
case PROP_NAME:
@@ -89,38 +89,38 @@
}
const gchar *
-almanah_link_format_value (AlmanahLink *self)
+almanah_event_format_value (AlmanahEvent *self)
{
- AlmanahLinkClass *klass = ALMANAH_LINK_GET_CLASS (self);
+ AlmanahEventClass *klass = ALMANAH_EVENT_GET_CLASS (self);
g_assert (klass->format_value != NULL);
return klass->format_value (self);
}
gboolean
-almanah_link_view (AlmanahLink *self)
+almanah_event_view (AlmanahEvent *self)
{
- AlmanahLinkClass *klass = ALMANAH_LINK_GET_CLASS (self);
+ AlmanahEventClass *klass = ALMANAH_EVENT_GET_CLASS (self);
g_assert (klass->view != NULL);
return klass->view (self);
}
const gchar *
-almanah_link_get_name (AlmanahLink *self)
+almanah_event_get_name (AlmanahEvent *self)
{
- AlmanahLinkClass *klass = ALMANAH_LINK_GET_CLASS (self);
+ AlmanahEventClass *klass = ALMANAH_EVENT_GET_CLASS (self);
return klass->name;
}
const gchar *
-almanah_link_get_description (AlmanahLink *self)
+almanah_event_get_description (AlmanahEvent *self)
{
- AlmanahLinkClass *klass = ALMANAH_LINK_GET_CLASS (self);
+ AlmanahEventClass *klass = ALMANAH_EVENT_GET_CLASS (self);
return klass->description;
}
const gchar *
-almanah_link_get_icon_name (AlmanahLink *self)
+almanah_event_get_icon_name (AlmanahEvent *self)
{
- AlmanahLinkClass *klass = ALMANAH_LINK_GET_CLASS (self);
+ AlmanahEventClass *klass = ALMANAH_EVENT_GET_CLASS (self);
return klass->icon_name;
}
Copied: trunk/src/event.h (from r119, /trunk/src/link.h)
==============================================================================
--- /trunk/src/link.h (original)
+++ trunk/src/event.h Sat Dec 13 14:42:19 2008
@@ -17,8 +17,8 @@
* along with Almanah. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef ALMANAH_LINK_H
-#define ALMANAH_LINK_H
+#ifndef ALMANAH_EVENT_H
+#define ALMANAH_EVENT_H
#include <glib.h>
#include <glib-object.h>
@@ -26,18 +26,18 @@
G_BEGIN_DECLS
-#define ALMANAH_TYPE_LINK (almanah_link_get_type ())
-#define ALMANAH_LINK(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), ALMANAH_TYPE_LINK, AlmanahLink))
-#define ALMANAH_LINK_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), ALMANAH_TYPE_LINK, AlmanahLinkClass))
-#define ALMANAH_IS_LINK(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), ALMANAH_TYPE_LINK))
-#define ALMANAH_IS_LINK_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), ALMANAH_TYPE_LINK))
-#define ALMANAH_LINK_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), ALMANAH_TYPE_LINK, AlmanahLinkClass))
+#define ALMANAH_TYPE_EVENT (almanah_event_get_type ())
+#define ALMANAH_EVENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), ALMANAH_TYPE_EVENT, AlmanahEvent))
+#define ALMANAH_EVENT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), ALMANAH_TYPE_EVENT, AlmanahEventClass))
+#define ALMANAH_IS_EVENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), ALMANAH_TYPE_EVENT))
+#define ALMANAH_IS_EVENT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), ALMANAH_TYPE_EVENT))
+#define ALMANAH_EVENT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), ALMANAH_TYPE_EVENT, AlmanahEventClass))
-typedef struct _AlmanahLinkPrivate AlmanahLinkPrivate;
+typedef struct _AlmanahEventPrivate AlmanahEventPrivate;
typedef struct {
GObject parent;
-} AlmanahLink;
+} AlmanahEvent;
typedef struct {
GObjectClass parent;
@@ -46,18 +46,18 @@
gchar *description;
gchar *icon_name;
- const gchar *(*format_value) (AlmanahLink *link);
- gboolean (*view) (AlmanahLink *link);
-} AlmanahLinkClass;
-
-GType almanah_link_get_type (void);
-
-const gchar *almanah_link_format_value (AlmanahLink *self);
-gboolean almanah_link_view (AlmanahLink *self);
-const gchar *almanah_link_get_name (AlmanahLink *self);
-const gchar *almanah_link_get_description (AlmanahLink *self);
-const gchar *almanah_link_get_icon_name (AlmanahLink *self);
+ const gchar *(*format_value) (AlmanahEvent *event);
+ gboolean (*view) (AlmanahEvent *event);
+} AlmanahEventClass;
+
+GType almanah_event_get_type (void);
+
+const gchar *almanah_event_format_value (AlmanahEvent *self);
+gboolean almanah_event_view (AlmanahEvent *self);
+const gchar *almanah_event_get_name (AlmanahEvent *self);
+const gchar *almanah_event_get_description (AlmanahEvent *self);
+const gchar *almanah_event_get_icon_name (AlmanahEvent *self);
G_END_DECLS
-#endif /* !ALMANAH_LINK_H */
+#endif /* !ALMANAH_EVENT_H */
Modified: trunk/src/events/calendar-appointment.c
==============================================================================
--- /trunk/src/links/calendar-appointment.c (original)
+++ trunk/src/events/calendar-appointment.c Sat Dec 13 14:42:19 2008
@@ -20,78 +20,78 @@
#include <glib.h>
#include <glib/gi18n.h>
-#include "link.h"
+#include "event.h"
#include "calendar-appointment.h"
#include "main.h"
-static void almanah_calendar_appointment_link_init (AlmanahCalendarAppointmentLink *self);
-static void almanah_calendar_appointment_link_finalize (GObject *object);
-static const gchar *almanah_calendar_appointment_link_format_value (AlmanahLink *link);
-static gboolean almanah_calendar_appointment_link_view (AlmanahLink *link);
+static void almanah_calendar_appointment_event_init (AlmanahCalendarAppointmentEvent *self);
+static void almanah_calendar_appointment_event_finalize (GObject *object);
+static const gchar *almanah_calendar_appointment_event_format_value (AlmanahEvent *event);
+static gboolean almanah_calendar_appointment_event_view (AlmanahEvent *event);
-struct _AlmanahCalendarAppointmentLinkPrivate {
+struct _AlmanahCalendarAppointmentEventPrivate {
gchar *summary;
GTime start_time;
};
-G_DEFINE_TYPE (AlmanahCalendarAppointmentLink, almanah_calendar_appointment_link, ALMANAH_TYPE_LINK)
-#define ALMANAH_CALENDAR_APPOINTMENT_LINK_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ALMANAH_TYPE_CALENDAR_APPOINTMENT_LINK, AlmanahCalendarAppointmentLinkPrivate))
+G_DEFINE_TYPE (AlmanahCalendarAppointmentEvent, almanah_calendar_appointment_event, ALMANAH_TYPE_EVENT)
+#define ALMANAH_CALENDAR_APPOINTMENT_EVENT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ALMANAH_TYPE_CALENDAR_APPOINTMENT_EVENT, AlmanahCalendarAppointmentEventPrivate))
static void
-almanah_calendar_appointment_link_class_init (AlmanahCalendarAppointmentLinkClass *klass)
+almanah_calendar_appointment_event_class_init (AlmanahCalendarAppointmentEventClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- AlmanahLinkClass *link_class = ALMANAH_LINK_CLASS (klass);
+ AlmanahEventClass *event_class = ALMANAH_EVENT_CLASS (klass);
- g_type_class_add_private (klass, sizeof (AlmanahCalendarAppointmentLinkPrivate));
+ g_type_class_add_private (klass, sizeof (AlmanahCalendarAppointmentEventPrivate));
- gobject_class->finalize = almanah_calendar_appointment_link_finalize;
+ gobject_class->finalize = almanah_calendar_appointment_event_finalize;
- link_class->name = _("Calendar Appointment");
- link_class->description = _("An appointment on an Evolution calendar.");
- link_class->icon_name = "appointment-new";
+ event_class->name = _("Calendar Appointment");
+ event_class->description = _("An appointment on an Evolution calendar.");
+ event_class->icon_name = "appointment-new";
- link_class->format_value = almanah_calendar_appointment_link_format_value;
- link_class->view = almanah_calendar_appointment_link_view;
+ event_class->format_value = almanah_calendar_appointment_event_format_value;
+ event_class->view = almanah_calendar_appointment_event_view;
}
static void
-almanah_calendar_appointment_link_init (AlmanahCalendarAppointmentLink *self)
+almanah_calendar_appointment_event_init (AlmanahCalendarAppointmentEvent *self)
{
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, ALMANAH_TYPE_CALENDAR_APPOINTMENT_LINK, AlmanahCalendarAppointmentLinkPrivate);
+ self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, ALMANAH_TYPE_CALENDAR_APPOINTMENT_EVENT, AlmanahCalendarAppointmentEventPrivate);
}
static void
-almanah_calendar_appointment_link_finalize (GObject *object)
+almanah_calendar_appointment_event_finalize (GObject *object)
{
- AlmanahCalendarAppointmentLinkPrivate *priv = ALMANAH_CALENDAR_APPOINTMENT_LINK_GET_PRIVATE (object);
+ AlmanahCalendarAppointmentEventPrivate *priv = ALMANAH_CALENDAR_APPOINTMENT_EVENT_GET_PRIVATE (object);
g_free (priv->summary);
/* Chain up to the parent class */
- G_OBJECT_CLASS (almanah_calendar_appointment_link_parent_class)->finalize (object);
+ G_OBJECT_CLASS (almanah_calendar_appointment_event_parent_class)->finalize (object);
}
-AlmanahCalendarAppointmentLink *
-almanah_calendar_appointment_link_new (const gchar *summary, GTime start_time)
+AlmanahCalendarAppointmentEvent *
+almanah_calendar_appointment_event_new (const gchar *summary, GTime start_time)
{
- AlmanahCalendarAppointmentLink *link = g_object_new (ALMANAH_TYPE_CALENDAR_APPOINTMENT_LINK, NULL);
- link->priv->summary = g_strdup (summary);
- link->priv->start_time = start_time;
+ AlmanahCalendarAppointmentEvent *event = g_object_new (ALMANAH_TYPE_CALENDAR_APPOINTMENT_EVENT, NULL);
+ event->priv->summary = g_strdup (summary);
+ event->priv->start_time = start_time;
- return link;
+ return event;
}
static const gchar *
-almanah_calendar_appointment_link_format_value (AlmanahLink *link)
+almanah_calendar_appointment_event_format_value (AlmanahEvent *event)
{
- return ALMANAH_CALENDAR_APPOINTMENT_LINK (link)->priv->summary;
+ return ALMANAH_CALENDAR_APPOINTMENT_EVENT (event)->priv->summary;
}
static gboolean
-almanah_calendar_appointment_link_view (AlmanahLink *link)
+almanah_calendar_appointment_event_view (AlmanahEvent *event)
{
- AlmanahCalendarAppointmentLinkPrivate *priv = ALMANAH_CALENDAR_APPOINTMENT_LINK (link)->priv;
+ AlmanahCalendarAppointmentEventPrivate *priv = ALMANAH_CALENDAR_APPOINTMENT_EVENT (event)->priv;
struct tm utc_date_tm;
gchar *command_line;
gboolean retval;
Modified: trunk/src/events/calendar-appointment.h
==============================================================================
--- /trunk/src/links/calendar-appointment.h (original)
+++ trunk/src/events/calendar-appointment.h Sat Dec 13 14:42:19 2008
@@ -17,37 +17,37 @@
* along with Almanah. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef ALMANAH_CALENDAR_APPOINTMENT_LINK_H
-#define ALMANAH_CALENDAR_APPOINTMENT_LINK_H
+#ifndef ALMANAH_CALENDAR_APPOINTMENT_EVENT_H
+#define ALMANAH_CALENDAR_APPOINTMENT_EVENT_H
#include <glib.h>
#include <glib-object.h>
-#include "link.h"
+#include "event.h"
G_BEGIN_DECLS
-#define ALMANAH_TYPE_CALENDAR_APPOINTMENT_LINK (almanah_calendar_appointment_link_get_type ())
-#define ALMANAH_CALENDAR_APPOINTMENT_LINK(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), ALMANAH_TYPE_CALENDAR_APPOINTMENT_LINK, AlmanahCalendarAppointmentLink))
-#define ALMANAH_CALENDAR_APPOINTMENT_LINK_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), ALMANAH_TYPE_CALENDAR_APPOINTMENT_LINK, AlmanahCalendarAppointmentLinkClass))
-#define ALMANAH_IS_CALENDAR_APPOINTMENT_LINK(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), ALMANAH_TYPE_CALENDAR_APPOINTMENT_LINK))
-#define ALMANAH_IS_CALENDAR_APPOINTMENT_LINK_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), ALMANAH_TYPE_CALENDAR_APPOINTMENT_LINK))
-#define ALMANAH_CALENDAR_APPOINTMENT_LINK_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), ALMANAH_TYPE_CALENDAR_APPOINTMENT_LINK, AlmanahCalendarAppointmentLinkClass))
+#define ALMANAH_TYPE_CALENDAR_APPOINTMENT_EVENT (almanah_calendar_appointment_event_get_type ())
+#define ALMANAH_CALENDAR_APPOINTMENT_EVENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), ALMANAH_TYPE_CALENDAR_APPOINTMENT_EVENT, AlmanahCalendarAppointmentEvent))
+#define ALMANAH_CALENDAR_APPOINTMENT_EVENT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), ALMANAH_TYPE_CALENDAR_APPOINTMENT_EVENT, AlmanahCalendarAppointmentEventClass))
+#define ALMANAH_IS_CALENDAR_APPOINTMENT_EVENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), ALMANAH_TYPE_CALENDAR_APPOINTMENT_EVENT))
+#define ALMANAH_IS_CALENDAR_APPOINTMENT_EVENT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), ALMANAH_TYPE_CALENDAR_APPOINTMENT_EVENT))
+#define ALMANAH_CALENDAR_APPOINTMENT_EVENT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), ALMANAH_TYPE_CALENDAR_APPOINTMENT_EVENT, AlmanahCalendarAppointmentEventClass))
-typedef struct _AlmanahCalendarAppointmentLinkPrivate AlmanahCalendarAppointmentLinkPrivate;
+typedef struct _AlmanahCalendarAppointmentEventPrivate AlmanahCalendarAppointmentEventPrivate;
typedef struct {
- AlmanahLink parent;
- AlmanahCalendarAppointmentLinkPrivate *priv;
-} AlmanahCalendarAppointmentLink;
+ AlmanahEvent parent;
+ AlmanahCalendarAppointmentEventPrivate *priv;
+} AlmanahCalendarAppointmentEvent;
typedef struct {
- AlmanahLinkClass parent;
-} AlmanahCalendarAppointmentLinkClass;
+ AlmanahEventClass parent;
+} AlmanahCalendarAppointmentEventClass;
-GType almanah_calendar_appointment_link_get_type (void);
-AlmanahCalendarAppointmentLink *almanah_calendar_appointment_link_new (const gchar *summary, GTime start_time);
+GType almanah_calendar_appointment_event_get_type (void);
+AlmanahCalendarAppointmentEvent *almanah_calendar_appointment_event_new (const gchar *summary, GTime start_time);
G_END_DECLS
-#endif /* !ALMANAH_CALENDAR_APPOINTMENT_LINK_H */
+#endif /* !ALMANAH_CALENDAR_APPOINTMENT_EVENT_H */
Modified: trunk/src/events/calendar-task.c
==============================================================================
--- /trunk/src/links/calendar-task.c (original)
+++ trunk/src/events/calendar-task.c Sat Dec 13 14:42:19 2008
@@ -20,78 +20,78 @@
#include <glib.h>
#include <glib/gi18n.h>
-#include "link.h"
+#include "event.h"
#include "calendar-task.h"
#include "main.h"
-static void almanah_calendar_task_link_init (AlmanahCalendarTaskLink *self);
-static void almanah_calendar_task_link_finalize (GObject *object);
-static const gchar *almanah_calendar_task_link_format_value (AlmanahLink *link);
-static gboolean almanah_calendar_task_link_view (AlmanahLink *link);
+static void almanah_calendar_task_event_init (AlmanahCalendarTaskEvent *self);
+static void almanah_calendar_task_event_finalize (GObject *object);
+static const gchar *almanah_calendar_task_event_format_value (AlmanahEvent *event);
+static gboolean almanah_calendar_task_event_view (AlmanahEvent *event);
-struct _AlmanahCalendarTaskLinkPrivate {
+struct _AlmanahCalendarTaskEventPrivate {
gchar *uid;
gchar *summary;
};
-G_DEFINE_TYPE (AlmanahCalendarTaskLink, almanah_calendar_task_link, ALMANAH_TYPE_LINK)
-#define ALMANAH_CALENDAR_TASK_LINK_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ALMANAH_TYPE_CALENDAR_TASK_LINK, AlmanahCalendarTaskLinkPrivate))
+G_DEFINE_TYPE (AlmanahCalendarTaskEvent, almanah_calendar_task_event, ALMANAH_TYPE_EVENT)
+#define ALMANAH_CALENDAR_TASK_EVENT_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), ALMANAH_TYPE_CALENDAR_TASK_EVENT, AlmanahCalendarTaskEventPrivate))
static void
-almanah_calendar_task_link_class_init (AlmanahCalendarTaskLinkClass *klass)
+almanah_calendar_task_event_class_init (AlmanahCalendarTaskEventClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- AlmanahLinkClass *link_class = ALMANAH_LINK_CLASS (klass);
+ AlmanahEventClass *event_class = ALMANAH_EVENT_CLASS (klass);
- g_type_class_add_private (klass, sizeof (AlmanahCalendarTaskLinkPrivate));
+ g_type_class_add_private (klass, sizeof (AlmanahCalendarTaskEventPrivate));
- gobject_class->finalize = almanah_calendar_task_link_finalize;
+ gobject_class->finalize = almanah_calendar_task_event_finalize;
- link_class->name = _("Calendar Task");
- link_class->description = _("A task on an Evolution calendar.");
- link_class->icon_name = "stock_task";
+ event_class->name = _("Calendar Task");
+ event_class->description = _("A task on an Evolution calendar.");
+ event_class->icon_name = "stock_task";
- link_class->format_value = almanah_calendar_task_link_format_value;
- link_class->view = almanah_calendar_task_link_view;
+ event_class->format_value = almanah_calendar_task_event_format_value;
+ event_class->view = almanah_calendar_task_event_view;
}
static void
-almanah_calendar_task_link_init (AlmanahCalendarTaskLink *self)
+almanah_calendar_task_event_init (AlmanahCalendarTaskEvent *self)
{
- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, ALMANAH_TYPE_CALENDAR_TASK_LINK, AlmanahCalendarTaskLinkPrivate);
+ self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, ALMANAH_TYPE_CALENDAR_TASK_EVENT, AlmanahCalendarTaskEventPrivate);
}
static void
-almanah_calendar_task_link_finalize (GObject *object)
+almanah_calendar_task_event_finalize (GObject *object)
{
- AlmanahCalendarTaskLinkPrivate *priv = ALMANAH_CALENDAR_TASK_LINK_GET_PRIVATE (object);
+ AlmanahCalendarTaskEventPrivate *priv = ALMANAH_CALENDAR_TASK_EVENT_GET_PRIVATE (object);
g_free (priv->uid);
g_free (priv->summary);
/* Chain up to the parent class */
- G_OBJECT_CLASS (almanah_calendar_task_link_parent_class)->finalize (object);
+ G_OBJECT_CLASS (almanah_calendar_task_event_parent_class)->finalize (object);
}
-AlmanahCalendarTaskLink *
-almanah_calendar_task_link_new (const gchar *uid, const gchar *summary)
+AlmanahCalendarTaskEvent *
+almanah_calendar_task_event_new (const gchar *uid, const gchar *summary)
{
- AlmanahCalendarTaskLink *link = g_object_new (ALMANAH_TYPE_CALENDAR_TASK_LINK, NULL);
- link->priv->uid = g_strdup (uid);
- link->priv->summary = g_strdup (summary);
- return link;
+ AlmanahCalendarTaskEvent *event = g_object_new (ALMANAH_TYPE_CALENDAR_TASK_EVENT, NULL);
+ event->priv->uid = g_strdup (uid);
+ event->priv->summary = g_strdup (summary);
+ return event;
}
static const gchar *
-almanah_calendar_task_link_format_value (AlmanahLink *link)
+almanah_calendar_task_event_format_value (AlmanahEvent *event)
{
- return ALMANAH_CALENDAR_TASK_LINK (link)->priv->summary;
+ return ALMANAH_CALENDAR_TASK_EVENT (event)->priv->summary;
}
static gboolean
-almanah_calendar_task_link_view (AlmanahLink *link)
+almanah_calendar_task_event_view (AlmanahEvent *event)
{
- AlmanahCalendarTaskLinkPrivate *priv = ALMANAH_CALENDAR_TASK_LINK (link)->priv;
+ AlmanahCalendarTaskEventPrivate *priv = ALMANAH_CALENDAR_TASK_EVENT (event)->priv;
gchar *command_line;
gboolean retval;
GError *error = NULL;
Modified: trunk/src/events/calendar-task.h
==============================================================================
--- /trunk/src/links/calendar-task.h (original)
+++ trunk/src/events/calendar-task.h Sat Dec 13 14:42:19 2008
@@ -17,37 +17,37 @@
* along with Almanah. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef ALMANAH_CALENDAR_TASK_LINK_H
-#define ALMANAH_CALENDAR_TASK_LINK_H
+#ifndef ALMANAH_CALENDAR_TASK_EVENT_H
+#define ALMANAH_CALENDAR_TASK_EVENT_H
#include <glib.h>
#include <glib-object.h>
-#include "link.h"
+#include "event.h"
G_BEGIN_DECLS
-#define ALMANAH_TYPE_CALENDAR_TASK_LINK (almanah_calendar_task_link_get_type ())
-#define ALMANAH_CALENDAR_TASK_LINK(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), ALMANAH_TYPE_CALENDAR_TASK_LINK, AlmanahCalendarTaskLink))
-#define ALMANAH_CALENDAR_TASK_LINK_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), ALMANAH_TYPE_CALENDAR_TASK_LINK, AlmanahCalendarTaskLinkClass))
-#define ALMANAH_IS_CALENDAR_TASK_LINK(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), ALMANAH_TYPE_CALENDAR_TASK_LINK))
-#define ALMANAH_IS_CALENDAR_TASK_LINK_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), ALMANAH_TYPE_CALENDAR_TASK_LINK))
-#define ALMANAH_CALENDAR_TASK_LINK_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), ALMANAH_TYPE_CALENDAR_TASK_LINK, AlmanahCalendarTaskLinkClass))
+#define ALMANAH_TYPE_CALENDAR_TASK_EVENT (almanah_calendar_task_event_get_type ())
+#define ALMANAH_CALENDAR_TASK_EVENT(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), ALMANAH_TYPE_CALENDAR_TASK_EVENT, AlmanahCalendarTaskEvent))
+#define ALMANAH_CALENDAR_TASK_EVENT_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), ALMANAH_TYPE_CALENDAR_TASK_EVENT, AlmanahCalendarTaskEventClass))
+#define ALMANAH_IS_CALENDAR_TASK_EVENT(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), ALMANAH_TYPE_CALENDAR_TASK_EVENT))
+#define ALMANAH_IS_CALENDAR_TASK_EVENT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), ALMANAH_TYPE_CALENDAR_TASK_EVENT))
+#define ALMANAH_CALENDAR_TASK_EVENT_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), ALMANAH_TYPE_CALENDAR_TASK_EVENT, AlmanahCalendarTaskEventClass))
-typedef struct _AlmanahCalendarTaskLinkPrivate AlmanahCalendarTaskLinkPrivate;
+typedef struct _AlmanahCalendarTaskEventPrivate AlmanahCalendarTaskEventPrivate;
typedef struct {
- AlmanahLink parent;
- AlmanahCalendarTaskLinkPrivate *priv;
-} AlmanahCalendarTaskLink;
+ AlmanahEvent parent;
+ AlmanahCalendarTaskEventPrivate *priv;
+} AlmanahCalendarTaskEvent;
typedef struct {
- AlmanahLinkClass parent;
-} AlmanahCalendarTaskLinkClass;
+ AlmanahEventClass parent;
+} AlmanahCalendarTaskEventClass;
-GType almanah_calendar_task_link_get_type (void);
-AlmanahCalendarTaskLink *almanah_calendar_task_link_new (const gchar *uid, const gchar *summary);
+GType almanah_calendar_task_event_get_type (void);
+AlmanahCalendarTaskEvent *almanah_calendar_task_event_new (const gchar *uid, const gchar *summary);
G_END_DECLS
-#endif /* !ALMANAH_CALENDAR_TASK_LINK_H */
+#endif /* !ALMANAH_CALENDAR_TASK_EVENT_H */
Modified: trunk/src/main-window.c
==============================================================================
--- trunk/src/main-window.c (original)
+++ trunk/src/main-window.c Sat Dec 13 14:42:19 2008
@@ -33,7 +33,7 @@
#include "printing.h"
#include "entry.h"
#include "storage-manager.h"
-#include "link.h"
+#include "event.h"
#include "definition.h"
static void almanah_main_window_init (AlmanahMainWindow *self);
@@ -48,10 +48,10 @@
static void mw_bold_toggled_cb (GtkToggleAction *action, AlmanahMainWindow *main_window);
static void mw_italic_toggled_cb (GtkToggleAction *action, AlmanahMainWindow *main_window);
static void mw_underline_toggled_cb (GtkToggleAction *action, AlmanahMainWindow *main_window);
-static void mw_links_updated_cb (AlmanahLinkManager *link_manager, AlmanahLinkFactoryType type_id, AlmanahMainWindow *main_window);
+static void mw_events_updated_cb (AlmanahEventManager *event_manager, AlmanahEventFactoryType type_id, AlmanahMainWindow *main_window);
void mw_calendar_day_selected_cb (GtkCalendar *calendar, AlmanahMainWindow *main_window);
-static void mw_links_selection_changed_cb (GtkTreeSelection *tree_selection, AlmanahMainWindow *main_window);
-static void mw_links_value_data_cb (GtkTreeViewColumn *column, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data);
+static void mw_events_selection_changed_cb (GtkTreeSelection *tree_selection, AlmanahMainWindow *main_window);
+static void mw_events_value_data_cb (GtkTreeViewColumn *column, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data);
struct _AlmanahMainWindowPrivate {
GtkTextView *entry_view;
@@ -61,10 +61,10 @@
GtkButton *view_button;
GtkAction *add_action;
GtkAction *remove_action;
- GtkListStore *link_store;
- GtkTreeSelection *links_selection;
- GtkTreeViewColumn *link_value_column;
- GtkCellRendererText *link_value_renderer;
+ GtkListStore *event_store;
+ GtkTreeSelection *events_selection;
+ GtkTreeViewColumn *event_value_column;
+ GtkCellRendererText *event_value_renderer;
GtkToggleAction *bold_action;
GtkToggleAction *italic_action;
GtkToggleAction *underline_action;
@@ -128,7 +128,7 @@
const gchar *interface_filename = almanah_get_interface_filename ();
const gchar *object_names[] = {
"dry_main_window",
- "dry_mw_link_store",
+ "dry_mw_event_store",
"dry_mw_view_button_image",
"dry_ui_manager",
NULL
@@ -172,10 +172,10 @@
priv->view_button = GTK_BUTTON (gtk_builder_get_object (builder, "dry_mw_view_button"));
priv->add_action = GTK_ACTION (gtk_builder_get_object (builder, "dry_ui_add_definition"));
priv->remove_action = GTK_ACTION (gtk_builder_get_object (builder, "dry_ui_remove_definition"));
- priv->link_store = GTK_LIST_STORE (gtk_builder_get_object (builder, "dry_mw_link_store"));
- priv->links_selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (gtk_builder_get_object (builder, "dry_mw_links_tree_view")));
- priv->link_value_column = GTK_TREE_VIEW_COLUMN (gtk_builder_get_object (builder, "dry_mw_link_value_column"));
- priv->link_value_renderer = GTK_CELL_RENDERER_TEXT (gtk_builder_get_object (builder, "dry_mw_link_value_renderer"));
+ priv->event_store = GTK_LIST_STORE (gtk_builder_get_object (builder, "dry_mw_event_store"));
+ priv->events_selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (gtk_builder_get_object (builder, "dry_mw_events_tree_view")));
+ priv->event_value_column = GTK_TREE_VIEW_COLUMN (gtk_builder_get_object (builder, "dry_mw_event_value_column"));
+ priv->event_value_renderer = GTK_CELL_RENDERER_TEXT (gtk_builder_get_object (builder, "dry_mw_event_value_renderer"));
priv->bold_action = GTK_TOGGLE_ACTION (gtk_builder_get_object (builder, "dry_ui_bold"));;
priv->italic_action = GTK_TOGGLE_ACTION (gtk_builder_get_object (builder, "dry_ui_italic"));
priv->underline_action = GTK_TOGGLE_ACTION (gtk_builder_get_object (builder, "dry_ui_underline"));
@@ -227,20 +227,20 @@
g_signal_connect (priv->italic_action, "toggled", G_CALLBACK (mw_italic_toggled_cb), main_window);
g_signal_connect (priv->underline_action, "toggled", G_CALLBACK (mw_underline_toggled_cb), main_window);
- /* Notification for link changes */
- g_signal_connect (almanah->link_manager, "links-updated", G_CALLBACK (mw_links_updated_cb), main_window);
+ /* Notification for event changes */
+ g_signal_connect (almanah->event_manager, "events-updated", G_CALLBACK (mw_events_updated_cb), main_window);
/* Select the current day and month */
almanah_calendar_month_changed_cb (priv->calendar, NULL);
mw_calendar_day_selected_cb (priv->calendar, main_window);
/* Set up the treeview */
- g_signal_connect (priv->links_selection, "changed", G_CALLBACK (mw_links_selection_changed_cb), main_window);
- gtk_tree_view_column_set_cell_data_func (priv->link_value_column, GTK_CELL_RENDERER (priv->link_value_renderer), mw_links_value_data_cb, NULL, NULL);
+ g_signal_connect (priv->events_selection, "changed", G_CALLBACK (mw_events_selection_changed_cb), main_window);
+ gtk_tree_view_column_set_cell_data_func (priv->event_value_column, GTK_CELL_RENDERER (priv->event_value_renderer), mw_events_value_data_cb, NULL, NULL);
/* Prettify the UI */
almanah_interface_embolden_label (GTK_LABEL (gtk_builder_get_object (builder, "dry_mw_calendar_label")));
- almanah_interface_embolden_label (GTK_LABEL (gtk_builder_get_object (builder, "dry_mw_attached_links_label")));
+ almanah_interface_embolden_label (GTK_LABEL (gtk_builder_get_object (builder, "dry_mw_events_label")));
#ifndef ENABLE_ENCRYPTION
/* Remove the "Preferences" entry from the menu */
@@ -406,8 +406,8 @@
if (entry_is_empty == TRUE) {
gtk_calendar_unmark_day (priv->calendar, g_date_get_day (&date));
- /* Since the entry is empty, remove all the links from the treeview */
- gtk_list_store_clear (priv->link_store);
+ /* Since the entry is empty, remove all the events from the treeview */
+ gtk_list_store_clear (priv->event_store);
} else {
gtk_calendar_mark_day (priv->calendar, g_date_get_day (&date));
}
@@ -809,27 +809,27 @@
}
static void
-clear_factory_links (AlmanahMainWindow *self, AlmanahLinkFactoryType type_id)
+clear_factory_events (AlmanahMainWindow *self, AlmanahEventFactoryType type_id)
{
GtkTreeIter iter;
- GtkTreeModel *model = GTK_TREE_MODEL (self->priv->link_store);
+ GtkTreeModel *model = GTK_TREE_MODEL (self->priv->event_store);
if (almanah->debug == TRUE)
- g_debug ("Removing links belonging to factory %u from the list store...", type_id);
+ g_debug ("Removing events belonging to factory %u from the list store...", type_id);
if (gtk_tree_model_get_iter_first (model, &iter) == FALSE)
return;
while (TRUE) {
- AlmanahLinkFactoryType row_type_id;
+ AlmanahEventFactoryType row_type_id;
gtk_tree_model_get (model, &iter, 2, &row_type_id, -1);
if (row_type_id == type_id) {
if (almanah->debug == TRUE) {
- AlmanahLink *link;
- gtk_tree_model_get (model, &iter, 0, &link, -1);
- g_debug ("\t%s", almanah_link_format_value (link));
+ AlmanahEvent *event;
+ gtk_tree_model_get (model, &iter, 0, &event, -1);
+ g_debug ("\t%s", almanah_event_format_value (event));
}
if (gtk_list_store_remove (GTK_LIST_STORE (model), &iter) == FALSE)
@@ -841,46 +841,46 @@
}
if (almanah->debug == TRUE)
- g_debug ("Finished removing links.");
+ g_debug ("Finished removing events.");
}
static void
-mw_links_updated_cb (AlmanahLinkManager *link_manager, AlmanahLinkFactoryType type_id, AlmanahMainWindow *main_window)
+mw_events_updated_cb (AlmanahEventManager *event_manager, AlmanahEventFactoryType type_id, AlmanahMainWindow *main_window)
{
AlmanahMainWindowPrivate *priv = main_window->priv;
- GSList *_links, *links;
+ GSList *_events, *events;
GDate date;
get_selected_date (main_window, &date);
- _links = almanah_link_manager_get_links (link_manager, type_id, &date);
+ _events = almanah_event_manager_get_events (event_manager, type_id, &date);
- /* Clear all the links generated by this factory out of the list store first */
- clear_factory_links (main_window, type_id);
+ /* Clear all the events generated by this factory out of the list store first */
+ clear_factory_events (main_window, type_id);
if (almanah->debug == TRUE)
- g_debug ("Adding links from factory %u to the list store...", type_id);
+ g_debug ("Adding events from factory %u to the list store...", type_id);
- for (links = _links; links != NULL; links = g_slist_next (links)) {
+ for (events = _events; events != NULL; events = g_slist_next (events)) {
GtkTreeIter iter;
- AlmanahLink *link = links->data;
+ AlmanahEvent *event = events->data;
if (almanah->debug == TRUE)
- g_debug ("\t%s", almanah_link_format_value (link));
+ g_debug ("\t%s", almanah_event_format_value (event));
- gtk_list_store_append (priv->link_store, &iter);
- gtk_list_store_set (priv->link_store, &iter,
- 0, link,
- 1, almanah_link_get_icon_name (link),
+ gtk_list_store_append (priv->event_store, &iter);
+ gtk_list_store_set (priv->event_store, &iter,
+ 0, event,
+ 1, almanah_event_get_icon_name (event),
2, type_id,
-1);
- g_object_unref (link);
+ g_object_unref (event);
}
if (almanah->debug == TRUE)
- g_debug ("Finished adding links.");
+ g_debug ("Finished adding events.");
- g_slist_free (_links);
+ g_slist_free (_events);
}
void
@@ -912,7 +912,7 @@
gtk_text_buffer_set_modified (priv->entry_buffer, FALSE);
/* Prepare for the possibility of failure --- do as much of the general interface changes as possible first */
- gtk_list_store_clear (priv->link_store);
+ gtk_list_store_clear (priv->event_store);
gtk_action_set_sensitive (priv->add_action, FALSE);
gtk_action_set_sensitive (priv->remove_action, FALSE); /* Only sensitive if something's selected */
gtk_widget_set_sensitive (GTK_WIDGET (priv->view_button), FALSE);
@@ -948,46 +948,46 @@
gtkspell_recheck_all (gtkspell);
#endif /* ENABLE_SPELL_CHECKING */
- /* List the entry's links */
- almanah_link_manager_query_links (almanah->link_manager, ALMANAH_LINK_FACTORY_UNKNOWN, &calendar_date);
+ /* List the entry's events */
+ almanah_event_manager_query_events (almanah->event_manager, ALMANAH_EVENT_FACTORY_UNKNOWN, &calendar_date);
}
static void
-mw_links_selection_changed_cb (GtkTreeSelection *tree_selection, AlmanahMainWindow *main_window)
+mw_events_selection_changed_cb (GtkTreeSelection *tree_selection, AlmanahMainWindow *main_window)
{
AlmanahMainWindowPrivate *priv = main_window->priv;
gtk_widget_set_sensitive (GTK_WIDGET (priv->view_button), (gtk_tree_selection_count_selected_rows (tree_selection) == 0) ? FALSE : TRUE);
}
static void
-mw_links_value_data_cb (GtkTreeViewColumn *column, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data)
+mw_events_value_data_cb (GtkTreeViewColumn *column, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer user_data)
{
const gchar *new_value;
- AlmanahLink *link;
+ AlmanahEvent *event;
- /* TODO: Should really create a new model to render AlmanahLinks */
+ /* TODO: Should really create a new model to render AlmanahEvents */
gtk_tree_model_get (model, iter,
- 0, &link,
+ 0, &event,
-1);
- new_value = almanah_link_format_value (link);
+ new_value = almanah_event_format_value (event);
g_object_set (renderer, "text", new_value, NULL);
}
void
-mw_links_tree_view_row_activated_cb (GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, AlmanahMainWindow *main_window)
+mw_events_tree_view_row_activated_cb (GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, AlmanahMainWindow *main_window)
{
- AlmanahLink *link;
+ AlmanahEvent *event;
GtkTreeIter iter;
- gtk_tree_model_get_iter (GTK_TREE_MODEL (main_window->priv->link_store), &iter, path);
- gtk_tree_model_get (GTK_TREE_MODEL (main_window->priv->link_store), &iter,
- 0, &link,
+ gtk_tree_model_get_iter (GTK_TREE_MODEL (main_window->priv->event_store), &iter, path);
+ gtk_tree_model_get (GTK_TREE_MODEL (main_window->priv->event_store), &iter,
+ 0, &event,
-1);
- /* NOTE: Link types should display their own errors, so one won't be displayed here. */
- almanah_link_view (link);
+ /* NOTE: event types should display their own errors, so one won't be displayed here. */
+ almanah_event_view (event);
}
gboolean
@@ -1000,25 +1000,25 @@
void
mw_view_button_clicked_cb (GtkButton *button, AlmanahMainWindow *main_window)
{
- GList *links;
+ GList *events;
GtkTreeModel *model;
- links = gtk_tree_selection_get_selected_rows (main_window->priv->links_selection, &model);
+ events = gtk_tree_selection_get_selected_rows (main_window->priv->events_selection, &model);
- for (; links != NULL; links = links->next) {
- AlmanahLink *link;
+ for (; events != NULL; events = events->next) {
+ AlmanahEvent *event;
GtkTreeIter iter;
- gtk_tree_model_get_iter (model, &iter, (GtkTreePath*) links->data);
+ gtk_tree_model_get_iter (model, &iter, (GtkTreePath*) events->data);
gtk_tree_model_get (model, &iter,
- 0, &link,
+ 0, &event,
-1);
- /* NOTE: Link types should display their own errors, so one won't be displayed here. */
- almanah_link_view (link);
+ /* NOTE: event types should display their own errors, so one won't be displayed here. */
+ almanah_event_view (event);
- gtk_tree_path_free (links->data);
+ gtk_tree_path_free (events->data);
}
- g_list_free (links);
+ g_list_free (events);
}
Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c (original)
+++ trunk/src/main.c Sat Dec 13 14:42:19 2008
@@ -25,7 +25,7 @@
#include "main.h"
#include "storage-manager.h"
-#include "link-manager.h"
+#include "event-manager.h"
#include "interface.h"
static void
@@ -64,7 +64,7 @@
#endif /* ENABLE_ENCRYPTION */
gtk_widget_destroy (almanah->main_window);
- g_object_unref (almanah->link_manager);
+ g_object_unref (almanah->event_manager);
/* Quitting is actually done in storage_manager_disconnected_cb, which is called once
* the storage manager has encrypted the DB and disconnected from it.
@@ -150,8 +150,8 @@
almanah_quit ();
}
- /* Create the link manager */
- almanah->link_manager = almanah_link_manager_new ();
+ /* Create the event manager */
+ almanah->event_manager = almanah_event_manager_new ();
/* Create and show the interface */
almanah_create_interface ();
Modified: trunk/src/main.h
==============================================================================
--- trunk/src/main.h (original)
+++ trunk/src/main.h Sat Dec 13 14:42:19 2008
@@ -23,7 +23,7 @@
#include <gconf/gconf-client.h>
#include "storage-manager.h"
-#include "link-manager.h"
+#include "event-manager.h"
#ifndef ALMANAH_MAIN_H
#define ALMANAH_MAIN_H
@@ -36,7 +36,7 @@
typedef struct {
AlmanahStorageManager *storage_manager;
- AlmanahLinkManager *link_manager;
+ AlmanahEventManager *event_manager;
GConfClient *gconf_client;
GtkWidget *main_window;
Modified: trunk/src/storage-manager.h
==============================================================================
--- trunk/src/storage-manager.h (original)
+++ trunk/src/storage-manager.h Sat Dec 13 14:42:19 2008
@@ -76,7 +76,7 @@
void almanah_storage_manager_free_results (AlmanahQueryResults *results);
gboolean almanah_storage_manager_query_async (AlmanahStorageManager *self, const gchar *query, const AlmanahQueryCallback callback, gpointer user_data, GError **error, ...);
-gboolean almanah_storage_manager_get_statistics (AlmanahStorageManager *self, guint *entry_count, guint *link_count);
+gboolean almanah_storage_manager_get_statistics (AlmanahStorageManager *self, guint *entry_count, guint *definition_count);
gboolean almanah_storage_manager_entry_exists (AlmanahStorageManager *self, GDate *date);
AlmanahEntry *almanah_storage_manager_get_entry (AlmanahStorageManager *self, GDate *date);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
