#include <libosso-abook/osso-abook-contact.h>
#include <libosso-abook/osso-abook-waitable.h>
#include <libosso-abook/osso-abook-presence.h>
-#include <libosso-abook/osso-abook-avatar.h>
#include <libosso-abook/osso-abook-touch-contact-starter.h>
#include <libosso-abook/osso-abook-temporary-contact-dialog.h>
#include <libosso-abook/osso-abook-account-manager.h>
GtkWidget *unread;
GtkWidget *received;
GtkWidget *cut_message;
- GtkWidget *avatar;
/* empty view*/
GtkWidget *empty;
update_presence_pixbuf (self, presence);
}
+static void
+show_contact (ELHomeApplet *self)
+{
+ ELHomeAppletPrivate *priv = self->priv;
+
+ gtk_label_set_text (GTK_LABEL (priv->sender),
+ osso_abook_contact_get_display_name (priv->contact));
+ resize_sender (priv);
+ gtk_widget_queue_draw (GTK_WIDGET (self));
+}
static void
resolve_contact (ELHomeApplet *self)
if (contacts && contacts->data) {
priv->contact = g_object_ref (OSSO_ABOOK_CONTACT (contacts->data));
- gtk_label_set_text (GTK_LABEL (priv->sender),
- osso_abook_contact_get_display_name (priv->contact));
-
+ g_signal_connect (priv->contact,
+ "notify::presence-status",
+ G_CALLBACK (presence_updated),
+ self);
priv->avatar_pixbuf = osso_abook_avatar_get_image_scaled
(OSSO_ABOOK_AVATAR (priv->contact),
HILDON_ICON_PIXEL_SIZE_THUMB,
HILDON_ICON_PIXEL_SIZE_THUMB,
TRUE);
-
update_presence_pixbuf (self,
OSSO_ABOOK_PRESENCE (priv->contact));
- g_signal_connect (priv->contact,
- "notify::presence-status",
- G_CALLBACK (presence_updated),
- self);
-
- resize_sender (priv);
- gtk_widget_queue_draw (GTK_WIDGET (self));
+ show_contact (self);
}
-
}
static void
{
ELHomeAppletPrivate *priv = self->priv;
- gtk_widget_hide (priv->icon);
-
if (priv->avatar_pixbuf) {
g_object_unref (priv->avatar_pixbuf);
priv->avatar_pixbuf = NULL;
}
static void
-clean_state (ELHomeApplet *self)
+clean_contact (ELHomeApplet *self)
{
ELHomeAppletPrivate *priv = self->priv;
reset_contact (self);
+ if (priv->aggregator) {
+ if (priv->aggregator_ready_closure){
+ osso_abook_waitable_cancel (OSSO_ABOOK_WAITABLE (priv->aggregator),
+ priv->aggregator_ready_closure);
+ priv->aggregator_ready_closure = NULL;
+ }
+ g_signal_handlers_disconnect_by_func (priv->aggregator,
+ contacts_added,
+ self);
+ g_signal_handlers_disconnect_by_func (priv->aggregator,
+ contacts_removed,
+ self);
+ osso_abook_roster_stop (priv->aggregator);
+ g_object_unref (priv->aggregator);
+ priv->aggregator = NULL;
+ }
+}
+
+static void
+clean_state (ELHomeApplet *self)
+{
+ ELHomeAppletPrivate *priv = self->priv;
+
if (priv->message) {
g_free (priv->message);
priv->message = NULL;
g_free (priv->group_uid);
priv->group_uid = NULL;
}
-
- if (priv->aggregator) {
- if (priv->aggregator_ready_closure){
- osso_abook_waitable_cancel (OSSO_ABOOK_WAITABLE (priv->aggregator),
- priv->aggregator_ready_closure);
- priv->aggregator_ready_closure = NULL;
- }
- g_signal_handlers_disconnect_by_func (priv->aggregator,
- contacts_added,
- self);
- g_signal_handlers_disconnect_by_func (priv->aggregator,
- contacts_removed,
- self);
- osso_abook_roster_stop (priv->aggregator);
- g_object_unref (priv->aggregator);
- priv->aggregator = NULL;
- }
}
static void
}
clean_state (EL_HOME_APPLET (self));
+ clean_contact (EL_HOME_APPLET (self));
G_OBJECT_CLASS (el_home_applet_parent_class)->dispose (self);
}
priv->event_id = -1;
}
- gtk_widget_hide (priv->avatar);
-
if (priv->message) {
gtk_widget_hide (priv->empty);
}
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);
return count;
}
-static gint
-query_read_events (RTComEl *el, const gchar *service)
+static gboolean
+query_read_events (RTComEl *el, const gchar *service, gint *events, gint *conversations)
{
sqlite3 *db;
sqlite3_stmt *stmt;
int ret;
- gint count = -1;
+ gboolean result = TRUE;
g_object_get (el, "db", &db, NULL);
if (sqlite3_prepare_v2 (db,
- "SELECT SUM(total_events) FROM GroupCache, Services "
+ "SELECT SUM(total_events), COUNT(group_uid) FROM GroupCache, Services "
"WHERE GroupCache.service_id=Services.id AND Services.name=?;",
-1,
&stmt,
NULL) != SQLITE_OK) {
g_error ("%s: can't compile SQL", G_STRFUNC);
- return -1;
+ return FALSE;
}
if (sqlite3_bind_text (stmt, 1, service, -1, SQLITE_STATIC) != SQLITE_OK) {
g_error ("Failed to bind %s to SQL stmt", service);
+ result = FALSE;
goto DONE;
}
while (SQLITE_BUSY == (ret = sqlite3_step (stmt)));
if (ret == SQLITE_ROW) {
- count = sqlite3_column_int (stmt, 0);
+ *events = sqlite3_column_int (stmt, 0);
+ *conversations = sqlite3_column_int (stmt, 1);
}
else {
g_error ("%s: error while executing SQL", G_STRFUNC);
+ result = FALSE;
+ goto DONE;
}
DONE:
sqlite3_finalize (stmt);
- return count;
+ return result;
+}
+
+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
ELHomeAppletPrivate *priv = self->priv;
RTComElIter *it = NULL;
const gchar *icon_name = NULL;
+ gchar *remote_id;
+ gchar *local_id;
+
+ remote_id = g_strdup (priv->remote_id);
+ local_id = g_strdup (priv->local_id);
clean_state (self);
if (it) g_object_unref (it);
if (priv->event_id >= 0) {
- start_aggregator (self);
+ gboolean new_account = g_strcmp0 (priv->local_id, local_id);
- if (g_strcmp0 (priv->local_id, "ring/tel/ring") == 0) {
- icon_name = "general_sms";
+ if (g_strcmp0 (priv->remote_id, remote_id) || new_account) {
+ clean_contact (self);
+ start_aggregator (self);
}
- 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);
- }
+ else {
+ show_contact (self);
}
- if (icon_name) {
- gtk_image_set_from_icon_name (GTK_IMAGE (priv->icon),
- icon_name,
- HILDON_ICON_SIZE_XSMALL);
- gtk_widget_show (priv->icon);
+ if (new_account) {
+ g_warning ("Update service icon");
+ if (g_strcmp0 (priv->local_id, "ring/tel/ring") == 0) {
+ icon_name = "general_sms";
+ }
+ else {
+ McAccount *account;
+ 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);
+ }
+ }
+ }
+
+ if (icon_name) {
+ gtk_image_set_from_icon_name (GTK_IMAGE (priv->icon),
+ icon_name,
+ HILDON_ICON_SIZE_XSMALL);
+ gtk_widget_show (priv->icon);
+ }
+ else
+ gtk_widget_hide (priv->icon);
}
}
else {
- gint n_sms_events = query_read_events (priv->eventlogger,
- "RTCOM_EL_SERVICE_SMS");
- gint n_chat_events = query_read_events (priv->eventlogger,
- "RTCOM_EL_SERVICE_CHAT");
gchar *text;
-
- text = g_strdup_printf ("%d", n_sms_events);
- gtk_label_set_text (GTK_LABEL (priv->sms_total), text);
+ gint n_sms_events = 0, n_sms_convs = 0;
+ gint n_chat_events = 0, n_chat_convs = 0;
+ const gchar *fmt = "%d <span size=\"small\">(%d)</span>";
+
+ query_read_events (priv->eventlogger,
+ "RTCOM_EL_SERVICE_SMS",
+ &n_sms_events, &n_sms_convs);
+ query_read_events (priv->eventlogger,
+ "RTCOM_EL_SERVICE_CHAT",
+ &n_chat_events, &n_chat_convs);
+
+ text = g_strdup_printf (fmt, n_sms_convs, n_sms_events);
+ gtk_label_set_markup (GTK_LABEL (priv->sms_total), text);
g_free (text);
- text = g_strdup_printf ("%d", n_chat_events);
- gtk_label_set_text (GTK_LABEL (priv->chat_total), text);
+ text = g_strdup_printf (fmt, n_chat_convs, n_chat_events);
+ gtk_label_set_markup (GTK_LABEL (priv->chat_total), text);
g_free (text);
gtk_label_set_text (GTK_LABEL (priv->sender),
dgettext ("rtcom-messaging-ui",
"messaging_ap_conversations"));
+
+ clean_contact (self);
+ gtk_widget_hide (priv->icon);
}
+
+ g_free (local_id);
+ g_free (remote_id);
}
static void
ELHomeApplet *self)
{
g_warning ("%s %s %s %s", local_uid, remote_uid, remote_ebook_uid, service);
-#if 0
- const gchar** conv_service = conv_services;
+
+ if (service && service[0] != '\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;
+ do {
+ g_warning ("%s", *conv_service);
+ 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
0.5f,
0.5f);
- priv->avatar = gtk_image_new ();
- gtk_misc_set_alignment (GTK_MISC (priv->avatar),
- 0.5f,
- 0.5f);
-
priv->sender = gtk_label_new ("asdf asdf asdf asdf asdf");
gtk_misc_set_alignment (GTK_MISC (priv->sender),
0.5f,
gtk_widget_set_name (priv->sms_total, "hildon-shadow-label");
gtk_fixed_put (GTK_FIXED (priv->empty), priv->sms_total,
5*HILDON_MARGIN_DOUBLE + HILDON_ICON_PIXEL_SIZE_FINGER,
- 2*HILDON_MARGIN_DOUBLE + HILDON_MARGIN_DEFAULT);
+ 2*HILDON_MARGIN_DOUBLE + HILDON_MARGIN_HALF);
priv->chat_total = gtk_label_new (NULL);
gtk_widget_set_name (priv->chat_total, "hildon-shadow-label");
gtk_fixed_put (GTK_FIXED (priv->empty), priv->chat_total,
5*HILDON_MARGIN_DOUBLE + HILDON_ICON_PIXEL_SIZE_FINGER,
- 3*HILDON_MARGIN_DOUBLE + HILDON_MARGIN_DEFAULT + HILDON_ICON_PIXEL_SIZE_FINGER);
+ 3*HILDON_MARGIN_DOUBLE + HILDON_MARGIN_HALF + HILDON_ICON_PIXEL_SIZE_FINGER);
gtk_widget_show_all (GTK_WIDGET (priv->empty));
gtk_widget_hide (GTK_WIDGET (priv->empty));
projects / conv-inbox / blobdiff