#include <rtcom-eventlogger/eventlogger.h>
#include <sqlite3.h>
#include <string.h>
+#include <gconf/gconf-client.h>
#include <libosso-abook/osso-abook-init.h>
#include <libosso-abook/osso-abook-aggregator.h>
#include <libosso-abook/osso-abook-contact.h>
gchar *local_id;
gchar *group_uid;
OssoABookContact *contact;
+
+ gboolean time_fmt_24h;
};
HD_DEFINE_PLUGIN_MODULE (ELHomeApplet, el_home_applet, HD_TYPE_HOME_PLUGIN_ITEM);
const gchar*
g_module_check_init (GModule *module)
{
- g_module_make_resident (module);
- return NULL;
+ g_module_make_resident (module);
+ return NULL;
}
static void
g_object_unref (priv->presence_pixbuf);
priv->presence_pixbuf = NULL;
}
- g_warning ("presence %s", icon_name);
if (icon_name)
priv->presence_pixbuf = gtk_icon_theme_load_icon
ELHomeAppletPrivate *priv = self->priv;
EBookQuery *query = NULL;
GError *error = NULL;
- g_warning ("%s rid %s lid %s", G_STRFUNC, priv->remote_id, priv->local_id);
+
if (priv->local_id && priv->remote_id) {
const gchar *vcard = osso_abook_account_manager_get_vcard_field
(NULL, priv->local_id);
else
query = e_book_query_any_field_contains (priv->remote_id);
}
- g_warning ("%s query %p", G_STRFUNC, query);
+
if (query) {
priv->aggregator = osso_abook_aggregator_new_with_query (NULL,
query,
}
if (priv->aggregator) {
- g_warning ("%s start aggr", G_STRFUNC);
priv->aggregator_ready_closure = osso_abook_waitable_call_when_ready
(OSSO_ABOOK_WAITABLE (priv->aggregator),
aggregator_ready_cb,
}
static gchar*
-format_time (time_t t)
+format_time (time_t t, gboolean time_fmt_24h)
{
- static const guint RESULT_SIZE = 32;
+ static const guint RESULT_SIZE = 64;
time_t now;
struct tm now_tm, t_tm;
- const gchar *format = "%x %X";
+ const gchar *time_format;
gchar *result = g_malloc0 (RESULT_SIZE);
now = time (NULL);
localtime_r (&now, &now_tm);
localtime_r (&t, &t_tm);
+ if (time_fmt_24h)
+ time_format = "wdgt_va_24h_time";
+ else
+ time_format = now_tm.tm_hour > 11 ?
+ "wdgt_va_12h_time_pm":
+ "wdgt_va_12h_time_am";
+
if ((now_tm.tm_year == t_tm.tm_year) &&
(now_tm.tm_mon == t_tm.tm_mon) &&
(now_tm.tm_mday == t_tm.tm_mday))
- format = "%X";
-
- strftime (result, RESULT_SIZE, format, &t_tm);
+ strftime (result,
+ RESULT_SIZE,
+ dgettext ("hildon-libs", time_format),
+ &t_tm);
+ else {
+ gchar *full_format = g_strdup_printf ("%s %s",
+ dgettext ("hildon-libs", "wdgt_va_date"),
+ dgettext ("hildon-libs", time_format));
+ strftime (result, RESULT_SIZE, full_format, &t_tm);
+ g_free (full_format);
+ }
return result;
}
priv->event_id = g_value_get_int (g_value_array_get_nth (event, 0));
received_t = g_value_get_int (g_value_array_get_nth (event, 1));
- received = format_time (received_t);
+ received = format_time (received_t, priv->time_fmt_24h);
priv->local_id = _VARR_DUP_STR (event, 2);
priv->remote_id = _VARR_DUP_STR (event, 3);
if (priv->remote_id && priv->remote_id[0]) {
rtcom_el_query_prepare (query,
"is-read", FALSE, RTCOM_EL_OP_EQUAL,
"service", conv_services, RTCOM_EL_OP_IN_STRV,
- /* "event-type", conv_event_types, RTCOM_EL_OP_IN_STRV, */
+ "event-type", conv_event_types, RTCOM_EL_OP_IN_STRV,
NULL);
}
it = rtcom_el_get_events (el, query);
}
static void
+am_ready (OssoABookAccountManager *manager,
+ const GError *error,
+ gpointer user_data)
+{
+ ELHomeApplet *self = EL_HOME_APPLET (user_data);
+ ELHomeAppletPrivate *priv = self->priv;
+
+ if (!error &&
+ priv->local_id &&
+ !GTK_WIDGET_VISIBLE (priv->icon)) {
+ McAccount *account;
+
+ account = osso_abook_account_manager_lookup_by_name (NULL,
+ priv->local_id);
+ if (account) {
+ McProfile *profile = mc_profile_lookup (mc_account_compat_get_profile (account));
+ const gchar *icon_name = mc_profile_get_icon_name (profile);
+ if (icon_name) {
+ gtk_image_set_from_icon_name (GTK_IMAGE (priv->icon),
+ icon_name,
+ HILDON_ICON_SIZE_XSMALL);
+ gtk_widget_show (priv->icon);
+ }
+ }
+ }
+}
+
+static void
read_event (ELHomeApplet *self)
{
ELHomeAppletPrivate *priv = self->priv;
}
if (new_account) {
- g_warning ("Update service icon");
if (g_strcmp0 (priv->local_id, "ring/tel/ring") == 0) {
icon_name = "general_sms";
}
- else{
+ else {
McAccount *account;
- account = osso_abook_account_manager_lookup_by_name (NULL,
- priv->local_id);
- if (account) {
- McProfile *profile = mc_profile_lookup (mc_account_compat_get_profile (account));
- icon_name = mc_profile_get_icon_name (profile);
+ OssoABookAccountManager *am = osso_abook_account_manager_get_default ();
+ if (!osso_abook_waitable_is_ready (OSSO_ABOOK_WAITABLE (am), NULL)) {
+ osso_abook_account_manager_call_when_ready (am,
+ am_ready,
+ self,
+ NULL);
+ }
+ else {
+ account = osso_abook_account_manager_lookup_by_name (NULL,
+ priv->local_id);
+ if (account) {
+ McProfile *profile = mc_profile_lookup (mc_account_compat_get_profile (account));
+ icon_name = mc_profile_get_icon_name (profile);
+ }
}
}
{
ELHomeAppletPrivate *priv = self->priv;
- g_warning ("read_new_event");
-
read_event (self);
priv->unread_count = query_unread_events (priv->eventlogger);
update_unread_label (self);
add_new_idle (ELHomeApplet *self)
{
ELHomeAppletPrivate *priv = self->priv;
- g_warning ("add_new_idle");
+
if (priv->idle_id)
g_source_remove (priv->idle_id);
priv->idle_id = g_idle_add ((GSourceFunc)read_new_event,
const gchar *service,
ELHomeApplet *self)
{
- g_warning ("%s %s %s %s", local_uid, remote_uid, remote_ebook_uid, service);
-#if 0
- const gchar** conv_service = conv_services;
- g_warning ("%s", service);
- do {
- g_warning ("%s", *conv_service);
- if (!g_strcmp0 (*conv_service, service)) {
- add_new_idle (self);
- return;
+ if (service && service[0] != '\0') {
+ const gchar** conv_service = conv_services;
+ do {
+ if (!g_strcmp0 (*conv_service, service)) {
+ add_new_idle (self);
+ return;
+ }
}
+ while(*++conv_service);
}
- while(*++conv_service);
-#else
- add_new_idle (self);
-#endif
+ else
+ add_new_idle (self);
}
static gboolean
self);
}
else
-#ifndef DEBUG_LAYOUT
mark_as_read (self);
-#endif
break;
default:;
}
GtkWidget *event_box;
GtkWidget *hbox, *vbox, *align, *footer;
GtkWidget *w;
+ GConfClient *gconf;
self->priv = EL_HOME_APPLET_GET_PRIVATE (self);
priv = self->priv;
gtk_widget_set_app_paintable (GTK_WIDGET (self), TRUE);
- priv->unread = gtk_label_new ("12");
+ priv->unread = gtk_label_new (NULL);
gtk_misc_set_alignment (GTK_MISC (priv->unread),
0.0f,
0.5f);
0.5f,
0.5f);
- priv->sender = gtk_label_new ("asdf asdf asdf asdf asdf");
+ priv->sender = gtk_label_new (NULL);
gtk_misc_set_alignment (GTK_MISC (priv->sender),
0.5f,
0.55f);
C_WIDTH,
HILDON_ICON_PIXEL_SIZE_THUMB);
- priv->message = g_strdup ("One two three four five six seven eight nine ten");
-
/* construt empty table */
priv->empty = gtk_fixed_new ();
gtk_widget_hide (GTK_WIDGET (priv->empty));
GTK_WIDGET_SET_FLAGS (priv->empty, GTK_NO_SHOW_ALL);
- priv->received = gtk_label_new ("aewf aewf aewf awef");
+ priv->received = gtk_label_new (NULL);
gtk_misc_set_alignment (GTK_MISC (priv->received),
1.0f,
0.5f);
gtk_widget_show_all (GTK_WIDGET (event_box));
-#ifndef DEBUG_LAYOUT
priv->eventlogger = rtcom_el_new ();
g_signal_connect (priv->eventlogger,
"new-event",
osso_abook_init_with_name (PACKAGE, NULL);
+ gconf = gconf_client_get_default ();
+ priv->time_fmt_24h = gconf_client_get_bool (gconf,
+ "/apps/clock/time-format",
+ NULL);
+ g_object_unref (gconf);
+
add_new_idle (self);
-#endif
}
static void
g_type_class_add_private (klass, sizeof (ELHomeAppletPrivate));
}
-