#include <libosso-abook/osso-abook-account-manager.h>
#include <telepathy-glib/interfaces.h>
+#include <telepathy-glib/dbus.h>
+#include <rtcom-telepathy-glib/extensions.h>
#define EL_HOME_APPLET_GET_PRIVATE(obj) ( \
G_TYPE_INSTANCE_GET_PRIVATE (obj, \
#define HEADER_HEIGHT 48
#define FOOTER_HEIGHT 24
#define FOOTER_HEIGHT_PRESS 48 /* approx, used only for checking clicks, bigger than controls */
-#define FOOTER_WIDTH C_WIDTH/4
+#define FOOTER_WIDTH C_WIDTH/5
#define MESSAGE_HEIGHT (C_HEIGHT - HEADER_HEIGHT - FOOTER_HEIGHT)
#define MESSAGE_WIDTH (C_WIDTH - 2*HILDON_MARGIN_DEFAULT)
gchar *contact_id;
gchar *remote_id;
gchar *local_id;
+ gchar *group_uid;
OssoABookContact *contact;
};
return result_surface;
}
-static void
+static gboolean
stop_scroll_anim (ELHomeAppletPrivate *priv)
{
- if (priv->scroll_anim_id > 0) {
+ gboolean result = priv->scroll_anim_id > 0;
+
+ if (result) {
g_source_remove (priv->scroll_anim_id);
priv->scroll_anim_id = 0;
priv->scroll_on_click = FALSE;
gtk_widget_hide (priv->cut_message);
}
+
+ return result;
}
static void
}
static void
+reset_scroll (ELHomeApplet *self)
+{
+ ELHomeAppletPrivate *priv = self->priv;
+
+ if (stop_scroll_anim (self->priv)) {
+ priv->scroll_on_click = TRUE;/* priv->scroll_offset; */
+ priv->scroll_offset = 0;
+ if (priv->scroll_on_click)
+ gtk_widget_show (priv->cut_message);
+ }
+}
+
+static void
notify_on_current_desktop (GObject *object,
GParamSpec *unused G_GNUC_UNUSED,
ELHomeApplet *self)
{
- ELHomeAppletPrivate *priv = self->priv;
gboolean on;
g_object_get (object, "is-on-current-desktop", &on, NULL);
if (!on) {
- stop_scroll_anim (self->priv);
- priv->scroll_on_click = priv->scroll_offset;
- priv->scroll_offset = 0;
- if (priv->scroll_on_click)
- gtk_widget_show (priv->cut_message);
+ reset_scroll (self);
gtk_widget_queue_draw (GTK_WIDGET (self));
}
}
g_free (priv->remote_id);
priv->remote_id = NULL;
}
+ if (priv->group_uid) {
+ g_free (priv->group_uid);
+ priv->group_uid = NULL;
+ }
if (priv->contact) {
g_object_unref (priv->contact);
priv->remote_id = NULL;
}
}
+ rtcom_el_iter_dup_string (it, "group-uid", &priv->group_uid);
#if 0
service = rtcom_el_iter_get_service (it);
if (!g_strcmp0 (service, "RTCOM_EL_SERVICE_SMS"))
update_unread_label (ELHomeApplet *self)
{
ELHomeAppletPrivate *priv = self->priv;
- gchar *text;
if (priv->unread_count > 0) {
- text = g_strdup_printf ("%d", priv->unread_count);
- gtk_label_set_text (GTK_LABEL (priv->unread), text);
+ gchar *text;
+ text = g_strdup_printf
+ ("%d<span foreground=\"red\" rise=\"5000\">*</span>",
+ priv->unread_count);
+
+ gtk_label_set_markup (GTK_LABEL (priv->unread), text);
g_free (text);
}
else
{
ELHomeAppletPrivate *priv = self->priv;
McAccount *account;
- McAccountChannelrequestData request;
+ const gchar *persistent_id = NULL;
- if (!(priv->remote_id && priv->local_id))
+ if (!((priv->remote_id || priv->group_uid) && priv->local_id))
return;
account = osso_abook_account_manager_lookup_by_name (NULL,
if (!account)
return;
- MC_ACCOUNT_CRD_INIT (&request);
- MC_ACCOUNT_CRD_SET (&request, channel_type, TP_IFACE_QUARK_CHANNEL_TYPE_TEXT);
- MC_ACCOUNT_CRD_SET (&request, target_handle_type, TP_HANDLE_TYPE_CONTACT);
- MC_ACCOUNT_CRD_SET (&request, target_id, priv->remote_id);
-
- mc_account_channelrequest (
- account,
- &request,
- time (NULL),
- NULL, /* handler */
- MC_ACCOUNT_CR_FLAG_USE_EXISTING,
- NULL, NULL, NULL, NULL);
+ if (priv->group_uid &&
+ g_str_has_prefix (priv->group_uid, "group:")) {
+ persistent_id = strchr (priv->group_uid, '-');
+ if (persistent_id)
+ persistent_id++;
+ }
+
+ if (persistent_id && persistent_id[0] != '\0') {
+ GHashTable *properties = tp_asv_new
+ (TP_IFACE_CHANNEL ".ChannelType", G_TYPE_STRING,
+ TP_IFACE_CHANNEL_TYPE_TEXT,
+ TP_IFACE_CHANNEL ".TargetHandleType", G_TYPE_UINT,
+ TP_HANDLE_TYPE_NONE,
+ RTCOM_TP_IFACE_CHANNEL_INTERFACE_PERSISTENT ".PersistentID",
+ G_TYPE_STRING, persistent_id,
+ NULL);
+
+ mc_account_channelrequest_ht (account,
+ properties,
+ time (NULL),
+ NULL,
+ MC_ACCOUNT_CR_FLAG_USE_EXISTING,
+ NULL, NULL, NULL, NULL);
+
+ g_hash_table_unref (properties);
+ }
+ else if (priv->remote_id) {
+ McAccountChannelrequestData request;
+
+ MC_ACCOUNT_CRD_INIT (&request);
+ MC_ACCOUNT_CRD_SET (&request, channel_type, TP_IFACE_QUARK_CHANNEL_TYPE_TEXT);
+ MC_ACCOUNT_CRD_SET (&request, target_handle_type, TP_HANDLE_TYPE_CONTACT);
+ MC_ACCOUNT_CRD_SET (&request, target_id, priv->remote_id);
+
+ mc_account_channelrequest (account,
+ &request,
+ time (NULL),
+ NULL,
+ MC_ACCOUNT_CR_FLAG_USE_EXISTING,
+ NULL, NULL, NULL, NULL);
+ }
}
static gboolean
ELHomeAppletPrivate *priv = self->priv;
if (priv->event_id > 0) {
- stop_scroll_anim (priv);
-
if (event->y < CONTENT_OFFSET_Y_TOP + HEADER_HEIGHT) {
if (priv->aggregator &&
osso_abook_waitable_is_ready
{
GtkWidget *dialog = NULL;
const gchar *vcard = NULL;
+ McAccount *account = NULL;
if (account_id) {
vcard = osso_abook_account_manager_get_vcard_field (NULL, account_id);
+ account = osso_abook_account_manager_lookup_by_name (NULL, account_id);
}
- if (vcard) {
+ if (vcard && account) {
EVCardAttribute *attribute = e_vcard_attribute_new (NULL, vcard);
e_vcard_attribute_add_value (attribute, remote_id);
(NULL,
NULL, /*EBook *book,*/
attribute,
- NULL /*McAccount *account*/);
+ account);
g_signal_connect (dialog,
"response",
G_CALLBACK (gtk_widget_destroy),
switch (priv->active) {
case SELECTED_BODY:
- if (priv->scroll_on_click) {
- priv->scroll_on_click = FALSE;
- priv->scroll_anim_id = g_timeout_add (SCROLL_PERIOD,
- (GSourceFunc)scroll_anim_cb,
- self);
- }
- else {
-#ifndef DEBUG_LAYOUT
- open_conversation (self);
-#endif
- }
- gtk_widget_queue_draw (widget);
-
+ reset_scroll (self);
+ open_conversation (self);
break;
case SELECTED_HEADER: {
GtkWidget *dialog = NULL;
+ reset_scroll (self);
+
if (priv->aggregator && priv->contact_id)
dialog = create_contact_starter_dialog
(OSSO_ABOOK_AGGREGATOR (priv->aggregator),
if (dialog)
gtk_widget_show (dialog);
-
- gtk_widget_queue_draw (widget);
}
break;
case SELECTED_FOOTER:
- mark_as_read (self);
+ if (priv->scroll_on_click) {
+ priv->scroll_on_click = FALSE;
+ priv->scroll_anim_id = g_timeout_add (SCROLL_PERIOD,
+ (GSourceFunc)scroll_anim_cb,
+ self);
+ }
+ else
+#ifndef DEBUG_LAYOUT
+ mark_as_read (self);
+#endif
break;
default:;
}
priv->active = SELECTED_NONE;
+ gtk_widget_queue_draw (widget);
+
return TRUE;
}
ELHomeAppletPrivate *priv = self->priv;
switch (priv->active) {
- case SELECTED_BODY:
+ case SELECTED_FOOTER:
stop_scroll_anim (priv);
- gtk_widget_queue_draw (widget);
- break;
+ /* fall down */
case SELECTED_HEADER:
- case SELECTED_FOOTER:
+ case SELECTED_BODY:
gtk_widget_queue_draw (widget);
break;
default:;
gtk_widget_set_app_paintable (GTK_WIDGET (self), TRUE);
priv->unread = gtk_label_new ("12");
- hildon_helper_set_logical_color (priv->unread,
- GTK_RC_FG,
- GTK_STATE_NORMAL,
- "ActiveTextColor");
gtk_misc_set_alignment (GTK_MISC (priv->unread),
0.0f,
0.5f);
projects / conv-inbox / blobdiff