From d180fb24e4039659e5f731bbbf80a827aefe517f Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Wed, 8 Dec 2010 16:04:00 +0000 Subject: event-manager: add the account to the EmpathyEvent struct Signed-off-by: Jonny Lamb --- src/empathy-event-manager.c | 35 ++++++++++++++++++++++------------- src/empathy-event-manager.h | 1 + 2 files changed, 23 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index 5516328cc..2f947478b 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -170,6 +170,11 @@ event_free (EventPriv *event) g_object_unref (event->public.contact); } + if (event->public.account) + { + g_object_unref (event->public.account); + } + g_slice_free (EventPriv, event); } @@ -212,6 +217,7 @@ display_notify_area (EmpathyEventManager *self) static void event_manager_add (EmpathyEventManager *manager, + TpAccount *account, EmpathyContact *contact, EmpathyEventType type, const gchar *icon_name, @@ -225,6 +231,7 @@ event_manager_add (EmpathyEventManager *manager, EventPriv *event; event = g_slice_new0 (EventPriv); + event->public.account = account != NULL ? g_object_ref (account) : NULL; event->public.contact = contact ? g_object_ref (contact) : NULL; event->public.type = type; event->public.icon_name = g_strdup (icon_name); @@ -549,9 +556,9 @@ event_manager_chat_message_received_cb (EmpathyTpChat *tp_chat, event_update (approval->manager, event, EMPATHY_IMAGE_NEW_MESSAGE, header, msg); else - event_manager_add (approval->manager, sender, EMPATHY_EVENT_TYPE_CHAT, - EMPATHY_IMAGE_NEW_MESSAGE, header, msg, approval, - event_text_channel_process_func, NULL); + event_manager_add (approval->manager, NULL, sender, + EMPATHY_EVENT_TYPE_CHAT, EMPATHY_IMAGE_NEW_MESSAGE, header, msg, + approval, event_text_channel_process_func, NULL); empathy_sound_manager_play (priv->sound_mgr, window, EMPATHY_SOUND_CONVERSATION_NEW); @@ -625,8 +632,8 @@ event_manager_media_channel_got_contact (EventManagerApproval *approval) video ? _("Incoming video call from %s") :_("Incoming call from %s"), empathy_contact_get_alias (approval->contact)); - event_manager_add (approval->manager, approval->contact, - EMPATHY_EVENT_TYPE_VOIP, + event_manager_add (approval->manager, NULL, + approval->contact, EMPATHY_EVENT_TYPE_VOIP, video ? EMPATHY_IMAGE_VIDEO_CALL : EMPATHY_IMAGE_VOIP, header, NULL, approval, event_channel_process_voip_func, NULL); @@ -758,9 +765,10 @@ display_invite_room_dialog (EventManagerApproval *approval) tp_channel_get_identifier (approval->main_channel)); } - event_manager_add (approval->manager, approval->contact, - EMPATHY_EVENT_TYPE_INVITATION, EMPATHY_IMAGE_GROUP_MESSAGE, msg, - invite_msg, approval, event_room_channel_process_func, NULL); + event_manager_add (approval->manager, NULL, + approval->contact, EMPATHY_EVENT_TYPE_INVITATION, + EMPATHY_IMAGE_GROUP_MESSAGE, msg, invite_msg, approval, + event_room_channel_process_func, NULL); empathy_sound_manager_play (priv->sound_mgr, window, EMPATHY_SOUND_CONVERSATION_NEW); @@ -807,8 +815,9 @@ event_manager_ft_got_contact_cb (TpConnection *connection, header = g_strdup_printf (_("Incoming file transfer from %s"), empathy_contact_get_alias (approval->contact)); - event_manager_add (approval->manager, approval->contact, - EMPATHY_EVENT_TYPE_TRANSFER, EMPATHY_IMAGE_DOCUMENT_SEND, header, NULL, + event_manager_add (approval->manager, NULL, + approval->contact, EMPATHY_EVENT_TYPE_TRANSFER, + EMPATHY_IMAGE_DOCUMENT_SEND, header, NULL, approval, event_channel_process_func, NULL); /* FIXME better sound for incoming file transfers ?*/ @@ -1023,7 +1032,7 @@ event_manager_pendings_changed_cb (EmpathyContactList *list, else event_msg = NULL; - event_manager_add (manager, contact, EMPATHY_EVENT_TYPE_SUBSCRIPTION, + event_manager_add (manager, NULL, contact, EMPATHY_EVENT_TYPE_SUBSCRIPTION, GTK_STOCK_DIALOG_QUESTION, header, event_msg, NULL, event_pending_subscribe_func, NULL); @@ -1066,7 +1075,7 @@ event_manager_presence_changed_cb (EmpathyContact *contact, header = g_strdup_printf (_("%s is now offline."), empathy_contact_get_alias (contact)); - event_manager_add (manager, contact, EMPATHY_EVENT_TYPE_PRESENCE, + event_manager_add (manager, NULL, contact, EMPATHY_EVENT_TYPE_PRESENCE, EMPATHY_IMAGE_AVATAR_DEFAULT, header, NULL, NULL, NULL, NULL); } } @@ -1087,7 +1096,7 @@ event_manager_presence_changed_cb (EmpathyContact *contact, header = g_strdup_printf (_("%s is now online."), empathy_contact_get_alias (contact)); - event_manager_add (manager, contact, EMPATHY_EVENT_TYPE_PRESENCE, + event_manager_add (manager, NULL, contact, EMPATHY_EVENT_TYPE_PRESENCE, EMPATHY_IMAGE_AVATAR_DEFAULT, header, NULL, NULL, NULL, NULL); } } diff --git a/src/empathy-event-manager.h b/src/empathy-event-manager.h index cc81d2ddb..d2d1597e1 100644 --- a/src/empathy-event-manager.h +++ b/src/empathy-event-manager.h @@ -58,6 +58,7 @@ typedef enum { } EmpathyEventType; typedef struct { + TpAccount *account; EmpathyContact *contact; EmpathyEventType type; gchar *icon_name; -- cgit v1.2.3 From 071992a0704d43baa2a72b576401ea1f68b44de6 Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Wed, 8 Dec 2010 18:24:21 +0000 Subject: event-manager: become an approver for auth channels Signed-off-by: Jonny Lamb --- src/empathy-event-manager.c | 90 ++++++++++++++++++++++++++++++++++++++++++--- src/empathy-event-manager.h | 1 + 2 files changed, 85 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index 2f947478b..9ab20b769 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -76,6 +76,7 @@ typedef struct { typedef struct { TpBaseClient *approver; + TpBaseClient *auth_approver; EmpathyContactManager *contact_manager; GSList *events; /* Ongoing approvals */ @@ -427,12 +428,47 @@ out: g_object_unref (user_data); } +static void +reject_auth_channel_claim_cb (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + TpChannelDispatchOperation *cdo = TP_CHANNEL_DISPATCH_OPERATION (source); + GError *error = NULL; + + if (!tp_channel_dispatch_operation_claim_finish (cdo, result, &error)) + { + DEBUG ("Failed to claim channel: %s", error->message); + + g_error_free (error); + return; + } + + tp_cli_channel_call_close (TP_CHANNEL (user_data), -1, + NULL, NULL, NULL, NULL); +} + static void reject_approval (EventManagerApproval *approval) { /* We have to claim the channel before closing it */ - tp_channel_dispatch_operation_claim_async (approval->operation, - reject_channel_claim_cb, g_object_ref (approval->handler_instance)); + + /* Unfortunately, we need to special case the auth channels for the + * time being as they don't have a wrapper object handler in + * approval->handler_instance as they're not actually handled by + * this process, so we can just use a noddy callback to call Close() + * directly. */ + if (approval->handler_instance != NULL) + { + tp_channel_dispatch_operation_claim_async (approval->operation, + reject_channel_claim_cb, g_object_ref (approval->handler_instance)); + } + else if (tp_channel_get_channel_type_id (approval->main_channel) + == TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION) + { + tp_channel_dispatch_operation_claim_async (approval->operation, + reject_auth_channel_claim_cb, approval->main_channel); + } } static void @@ -828,8 +864,13 @@ event_manager_ft_got_contact_cb (TpConnection *connection, g_object_unref (window); } -/* If there is a file-transfer or media channel consider it as the - * main one. */ +static void +dummy_process_func (EventPriv *event) +{ +} + +/* If there is a file-transfer, media, or auth channel consider it as + * the main one. */ static TpChannel * find_main_channel (GList *channels) { @@ -847,7 +888,8 @@ find_main_channel (GList *channels) channel_type = tp_channel_get_channel_type_id (channel); if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA || - channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER) + channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER || + channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION) return channel; else if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_TEXT) @@ -971,6 +1013,13 @@ approve_channels (TpSimpleApprover *approver, empathy_tp_contact_factory_get_from_handle (connection, handle, event_manager_ft_got_contact_cb, approval, NULL, G_OBJECT (self)); } + else if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION) + { + /* We need a process function or this will time out after + * NOTIFICATION_TIMEOUT seconds, which is undesirable. */ + event_manager_add (approval->manager, account, NULL, EMPATHY_EVENT_TYPE_AUTH, + NULL, NULL, NULL, approval, dummy_process_func, NULL); + } else { GError error = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, @@ -1159,6 +1208,7 @@ event_manager_finalize (GObject *object) g_slist_free (priv->approvals); g_object_unref (priv->contact_manager); g_object_unref (priv->approver); + g_object_unref (priv->auth_approver); g_object_unref (priv->gsettings_notif); g_object_unref (priv->gsettings_ui); g_object_unref (priv->sound_mgr); @@ -1200,7 +1250,6 @@ empathy_event_manager_class_init (EmpathyEventManagerClass *klass) g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); - g_type_class_add_private (object_class, sizeof (EmpathyEventManagerPriv)); } @@ -1271,12 +1320,41 @@ empathy_event_manager_init (EmpathyEventManager *manager) TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT, NULL)); + /* I don't feel good about doing this, and I'm sorry, but the + * capabilities connection feature is added earlier because it's + * needed for EmpathyTpChat. If the capabilities feature is required + * then preparing an auth channel (which of course appears in the + * CONNECTING state) will never be prepared. So the options are + * either to create another approver like I've done, or to port + * EmpathyTpChat and its users to not depend on the connection being + * prepared with capabilities. I chose the former, obviously. :-) */ + + priv->auth_approver = tp_simple_approver_new (dbus, + "Empathy.AuthEventManager", FALSE, approve_channels, manager, + NULL); + + /* SASL auth channels */ + tp_base_client_take_approver_filter (priv->auth_approver, + tp_asv_new ( + TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, + TP_IFACE_CHANNEL_TYPE_SERVER_AUTHENTICATION, + TP_PROP_CHANNEL_TYPE_SERVER_AUTHENTICATION_AUTHENTICATION_METHOD, + G_TYPE_STRING, + TP_IFACE_CHANNEL_INTERFACE_SASL_AUTHENTICATION, + NULL)); + if (!tp_base_client_register (priv->approver, &error)) { DEBUG ("Failed to register Approver: %s", error->message); g_error_free (error); } + if (!tp_base_client_register (priv->auth_approver, &error)) + { + DEBUG ("Failed to register auth Approver: %s", error->message); + g_error_free (error); + } + g_object_unref (dbus); } diff --git a/src/empathy-event-manager.h b/src/empathy-event-manager.h index d2d1597e1..16d97c6df 100644 --- a/src/empathy-event-manager.h +++ b/src/empathy-event-manager.h @@ -55,6 +55,7 @@ typedef enum { EMPATHY_EVENT_TYPE_SUBSCRIPTION, EMPATHY_EVENT_TYPE_PRESENCE, EMPATHY_EVENT_TYPE_INVITATION, + EMPATHY_EVENT_TYPE_AUTH, } EmpathyEventType; typedef struct { -- cgit v1.2.3 From 1a85f1ae21dd6be86f6e15e424ece5302c8faa4d Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Wed, 8 Dec 2010 18:24:47 +0000 Subject: notifications-approver: don't show notifications for auth events Signed-off-by: Jonny Lamb --- src/empathy-notifications-approver.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src') diff --git a/src/empathy-notifications-approver.c b/src/empathy-notifications-approver.c index 0bfe03274..e0d540cdc 100644 --- a/src/empathy-notifications-approver.c +++ b/src/empathy-notifications-approver.c @@ -314,7 +314,11 @@ event_added_cb (EmpathyEventManager *manager, if (self->priv->event != NULL) return; + if (event->type == EMPATHY_EVENT_TYPE_AUTH) + return; + self->priv->event = event; + update_notification (self); } @@ -326,6 +330,9 @@ event_removed_cb (EmpathyEventManager *manager, if (event != self->priv->event) return; + if (event->type == EMPATHY_EVENT_TYPE_AUTH) + return; + self->priv->event = empathy_event_manager_get_top_event ( self->priv->event_mgr); @@ -340,6 +347,9 @@ event_updated_cb (EmpathyEventManager *manager, if (event != self->priv->event) return; + if (event->type == EMPATHY_EVENT_TYPE_AUTH) + return; + if (empathy_notify_manager_notification_is_enabled (self->priv->notify_mgr)) update_notification (self); } -- cgit v1.2.3 From db9e0a4a2394977b62f1034864365b1cae6f4714 Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Wed, 8 Dec 2010 18:34:26 +0000 Subject: main-window: display an info bar approving or rejecting the auth channel Signed-off-by: Jonny Lamb --- src/empathy-main-window.c | 148 +++++++++++++++++++++++++++++++++++++++++++++ src/empathy-main-window.ui | 14 ++++- 2 files changed, 161 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index db5818c0c..e04a6bb21 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -122,6 +122,7 @@ struct _EmpathyMainWindowPriv { GtkWidget *presence_toolbar; GtkWidget *presence_chooser; GtkWidget *errors_vbox; + GtkWidget *auth_vbox; GtkWidget *search_bar; GtkWidget *notebook; GtkWidget *no_entry_label; @@ -143,6 +144,7 @@ struct _EmpathyMainWindowPriv { guint size_timeout_id; GHashTable *errors; + GHashTable *auths; /* stores a mapping from TpAccount to Handler ID to prevent * to listen more than once to the status-changed signal */ @@ -285,6 +287,138 @@ main_window_flash_start (EmpathyMainWindow *window) main_window_flash_cb (window); } +static void +main_window_remove_auth (EmpathyMainWindow *window, + EmpathyEvent *event) +{ + EmpathyMainWindowPriv *priv = GET_PRIV (window); + GtkWidget *error_widget; + + error_widget = g_hash_table_lookup (priv->auths, event); + if (error_widget != NULL) { + gtk_widget_destroy (error_widget); + g_hash_table_remove (priv->auths, event); + } +} + +static void +main_window_auth_add_clicked_cb (GtkButton *button, + EmpathyMainWindow *window) +{ + EmpathyEvent *event; + + event = g_object_get_data (G_OBJECT (button), "event"); + + empathy_event_approve (event); + + main_window_remove_auth (window, event); +} + +static void +main_window_auth_close_clicked_cb (GtkButton *button, + EmpathyMainWindow *window) +{ + EmpathyEvent *event; + + event = g_object_get_data (G_OBJECT (button), "event"); + + empathy_event_decline (event); + main_window_remove_auth (window, event); +} + +static void +main_window_auth_display (EmpathyMainWindow *window, + EmpathyEvent *event) +{ + EmpathyMainWindowPriv *priv = GET_PRIV (window); + TpAccount *account = event->account; + GtkWidget *info_bar; + GtkWidget *content_area; + GtkWidget *image; + GtkWidget *label; + GtkWidget *add_button; + GtkWidget *close_button; + GtkWidget *action_area; + GtkWidget *action_table; + const gchar *icon_name; + gchar *str; + + if (g_hash_table_lookup (priv->auths, event) != NULL) { + return; + } + + info_bar = gtk_info_bar_new (); + gtk_info_bar_set_message_type (GTK_INFO_BAR (info_bar), GTK_MESSAGE_QUESTION); + + gtk_widget_set_no_show_all (info_bar, TRUE); + gtk_box_pack_start (GTK_BOX (priv->auth_vbox), info_bar, FALSE, TRUE, 0); + gtk_widget_show (info_bar); + + icon_name = tp_account_get_icon_name (account); + image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_SMALL_TOOLBAR); + gtk_widget_show (image); + + str = g_markup_printf_escaped ("%s\n%s", + tp_account_get_display_name (account), + _("Password required")); + + label = gtk_label_new (str); + gtk_label_set_use_markup (GTK_LABEL (label), TRUE); + gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); + gtk_widget_show (label); + + g_free (str); + + content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (info_bar)); + gtk_box_pack_start (GTK_BOX (content_area), image, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (content_area), label, TRUE, TRUE, 0); + + image = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_BUTTON); + add_button = gtk_button_new (); + gtk_button_set_image (GTK_BUTTON (add_button), image); + gtk_widget_set_tooltip_text (add_button, _("Provide Password")); + gtk_widget_show (add_button); + + image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_BUTTON); + close_button = gtk_button_new (); + gtk_button_set_image (GTK_BUTTON (close_button), image); + gtk_widget_set_tooltip_text (close_button, _("Cancel")); + gtk_widget_show (close_button); + + action_table = gtk_table_new (1, 2, FALSE); + gtk_table_set_col_spacings (GTK_TABLE (action_table), 6); + gtk_widget_show (action_table); + + action_area = gtk_info_bar_get_action_area (GTK_INFO_BAR (info_bar)); + gtk_box_pack_start (GTK_BOX (action_area), action_table, FALSE, FALSE, 0); + + gtk_table_attach (GTK_TABLE (action_table), add_button, 0, 1, 0, 1, + (GtkAttachOptions) (GTK_SHRINK), + (GtkAttachOptions) (GTK_SHRINK), 0, 0); + gtk_table_attach (GTK_TABLE (action_table), close_button, 1, 2, 0, 1, + (GtkAttachOptions) (GTK_SHRINK), + (GtkAttachOptions) (GTK_SHRINK), 0, 0); + + g_object_set_data_full (G_OBJECT (info_bar), + "event", event, NULL); + g_object_set_data_full (G_OBJECT (add_button), + "event", event, NULL); + g_object_set_data_full (G_OBJECT (close_button), + "event", event, NULL); + + g_signal_connect (add_button, "clicked", + G_CALLBACK (main_window_auth_add_clicked_cb), + window); + g_signal_connect (close_button, "clicked", + G_CALLBACK (main_window_auth_close_clicked_cb), + window); + + gtk_widget_show (priv->auth_vbox); + + g_hash_table_insert (priv->auths, event, info_bar); +} + static void main_window_event_added_cb (EmpathyEventManager *manager, EmpathyEvent *event, @@ -292,6 +426,8 @@ main_window_event_added_cb (EmpathyEventManager *manager, { if (event->contact) { main_window_flash_start (window); + } else if (event->type == EMPATHY_EVENT_TYPE_AUTH) { + main_window_auth_display (window, event); } } @@ -303,6 +439,11 @@ main_window_event_removed_cb (EmpathyEventManager *manager, EmpathyMainWindowPriv *priv = GET_PRIV (window); FlashForeachData data; + if (event->type == EMPATHY_EVENT_TYPE_AUTH) { + main_window_remove_auth (window, event); + return; + } + if (!event->contact) { return; } @@ -711,6 +852,7 @@ empathy_main_window_finalize (GObject *window) g_object_unref (priv->contact_manager); g_object_unref (priv->sound_mgr); g_hash_table_destroy (priv->errors); + g_hash_table_destroy (priv->auths); /* disconnect all handlers of status-changed signal */ g_hash_table_iter_init (&iter, priv->status_changed_handlers); @@ -1591,6 +1733,7 @@ empathy_main_window_init (EmpathyMainWindow *window) gui = empathy_builder_get_file (filename, "main_vbox", &priv->main_vbox, "errors_vbox", &priv->errors_vbox, + "auth_vbox", &priv->auth_vbox, "ui_manager", &priv->ui_manager, "view_show_offline", &show_offline_widget, "view_show_protocols", &priv->show_protocols, @@ -1660,6 +1803,11 @@ empathy_main_window_init (EmpathyMainWindow *window) g_object_unref, NULL); + priv->auths = g_hash_table_new_full (g_direct_hash, + g_direct_equal, + NULL, + NULL); + priv->status_changed_handlers = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, diff --git a/src/empathy-main-window.ui b/src/empathy-main-window.ui index 8356a1af7..e684c6bdf 100644 --- a/src/empathy-main-window.ui +++ b/src/empathy-main-window.ui @@ -308,6 +308,18 @@ 2 + + + + + + + + False + False + 3 + + True @@ -340,7 +352,7 @@ - 3 + 4 -- cgit v1.2.3 From 41dd635842b27268454435c557b74ea32245c7ae Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Thu, 9 Dec 2010 17:32:13 +0000 Subject: status-icon: blink when we get a password request Signed-off-by: Jonny Lamb --- src/empathy-event-manager.c | 9 +++++---- src/empathy-status-icon.c | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index 9ab20b769..f657cae35 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -865,8 +865,9 @@ event_manager_ft_got_contact_cb (TpConnection *connection, } static void -dummy_process_func (EventPriv *event) +event_manager_auth_process_func (EventPriv *event) { + empathy_event_approve ((EmpathyEvent *) event); } /* If there is a file-transfer, media, or auth channel consider it as @@ -1015,10 +1016,10 @@ approve_channels (TpSimpleApprover *approver, } else if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION) { - /* We need a process function or this will time out after - * NOTIFICATION_TIMEOUT seconds, which is undesirable. */ event_manager_add (approval->manager, account, NULL, EMPATHY_EVENT_TYPE_AUTH, - NULL, NULL, NULL, approval, dummy_process_func, NULL); + GTK_STOCK_DIALOG_AUTHENTICATION, tp_account_get_display_name (account), + _("Password required"), approval, + event_manager_auth_process_func, NULL); } else { diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c index 0c834a670..38a68d433 100644 --- a/src/empathy-status-icon.c +++ b/src/empathy-status-icon.c @@ -159,7 +159,7 @@ status_icon_event_added_cb (EmpathyEventManager *manager, DEBUG ("New event %p", event); priv->event = event; - if (event->must_ack) { + if (event->must_ack || event->type == EMPATHY_EVENT_TYPE_AUTH) { priv->showing_event_icon = TRUE; status_icon_update_icon (icon); status_icon_update_tooltip (icon); -- cgit v1.2.3 From 05e14d747fd88a260996c406a938a1bfdfbaca8f Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Tue, 14 Dec 2010 16:33:46 +0000 Subject: event-manager: use tp_clear_object Signed-off-by: Jonny Lamb --- src/empathy-event-manager.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index f657cae35..93656c3a9 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -166,15 +166,8 @@ event_free (EventPriv *event) if (event->autoremove_timeout_id != 0) g_source_remove (event->autoremove_timeout_id); - if (event->public.contact) - { - g_object_unref (event->public.contact); - } - - if (event->public.account) - { - g_object_unref (event->public.account); - } + tp_clear_object (&(event->public.contact)); + tp_clear_object (&(event->public.account)); g_slice_free (EventPriv, event); } -- cgit v1.2.3 From 932835ccd42c55d77017d6ffc77773db40385a27 Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Tue, 14 Dec 2010 16:37:18 +0000 Subject: main-window: document what the key and value types are for hash tables Signed-off-by: Jonny Lamb --- src/empathy-main-window.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index e04a6bb21..d1dfc2942 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -143,7 +143,11 @@ struct _EmpathyMainWindowPriv { GtkWidget *edit_context_separator; guint size_timeout_id; + + /* reffed TpAccount* => visible GtkInfoBar* */ GHashTable *errors; + + /* EmpathyEvent* => visible GtkInfoBar* */ GHashTable *auths; /* stores a mapping from TpAccount to Handler ID to prevent -- cgit v1.2.3 From 01e02a165d271a155a4af0e79dd94c210b584cfa Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Tue, 14 Dec 2010 16:38:19 +0000 Subject: main-window: don't use _full functions where not necessary Signed-off-by: Jonny Lamb --- src/empathy-main-window.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src') diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index d1dfc2942..6907a12ef 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -1807,10 +1807,7 @@ empathy_main_window_init (EmpathyMainWindow *window) g_object_unref, NULL); - priv->auths = g_hash_table_new_full (g_direct_hash, - g_direct_equal, - NULL, - NULL); + priv->auths = g_hash_table_new (NULL, NULL); priv->status_changed_handlers = g_hash_table_new_full (g_direct_hash, g_direct_equal, -- cgit v1.2.3 From 225ca2e12b053a6c8ece18179d470f01ed1d6fb7 Mon Sep 17 00:00:00 2001 From: Jonny Lamb Date: Tue, 14 Dec 2010 16:38:48 +0000 Subject: main-window: s/Cancel/Disconnect/ when not giving a password Signed-off-by: Jonny Lamb --- src/empathy-main-window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index 6907a12ef..ce2f78042 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -387,7 +387,7 @@ main_window_auth_display (EmpathyMainWindow *window, image = gtk_image_new_from_stock (GTK_STOCK_CLOSE, GTK_ICON_SIZE_BUTTON); close_button = gtk_button_new (); gtk_button_set_image (GTK_BUTTON (close_button), image); - gtk_widget_set_tooltip_text (close_button, _("Cancel")); + gtk_widget_set_tooltip_text (close_button, _("Disconnect")); gtk_widget_show (close_button); action_table = gtk_table_new (1, 2, FALSE); -- cgit v1.2.3