After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 679136 - Stop using EmpathyContactWidget in the subscription request dialog
Stop using EmpathyContactWidget in the subscription request dialog
Status: RESOLVED FIXED
Product: empathy
Classification: Core
Component: General
2.33.x
Other Linux
: Normal enhancement
: ---
Assigned To: empathy-maint
empathy-maint
Depends on:
Blocks: 679111
 
 
Reported: 2012-06-29 12:44 UTC by Guillaume Desmottes
Modified: 2012-07-06 09:33 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
add empathy-subscription-dialog (13.09 KB, patch)
2012-06-29 12:45 UTC, Guillaume Desmottes
committed Details | Review
event-manager: use EmpathySubscriptionDialog (1.59 KB, patch)
2012-06-29 12:45 UTC, Guillaume Desmottes
committed Details | Review
remove empathy_subscription_dialog_show() (5.09 KB, patch)
2012-06-29 12:45 UTC, Guillaume Desmottes
committed Details | Review
inline block_contact_dialog_show() into subscription-dialog.c (5.70 KB, patch)
2012-06-29 12:45 UTC, Guillaume Desmottes
none Details | Review
individual-widget: don't display unknown presence (2.51 KB, patch)
2012-06-29 12:45 UTC, Guillaume Desmottes
committed Details | Review
inline block_contact_dialog_show() into subscription-dialog.c (6.47 KB, patch)
2012-06-29 12:48 UTC, Guillaume Desmottes
committed Details | Review

Description Guillaume Desmottes 2012-06-29 12:44:33 UTC
Part of bug #679111
Comment 1 Guillaume Desmottes 2012-06-29 12:45:40 UTC
Created attachment 217610 [details] [review]
add empathy-subscription-dialog

This is copied from the similar dialog in empathy-account-dialogs.c which I'm
about to remove.
Comment 2 Guillaume Desmottes 2012-06-29 12:45:43 UTC
Created attachment 217611 [details] [review]
event-manager: use EmpathySubscriptionDialog
Comment 3 Guillaume Desmottes 2012-06-29 12:45:45 UTC
Created attachment 217612 [details] [review]
remove empathy_subscription_dialog_show()
Comment 4 Guillaume Desmottes 2012-06-29 12:45:48 UTC
Created attachment 217613 [details] [review]
inline block_contact_dialog_show() into subscription-dialog.c

It's only used there now.
Comment 5 Guillaume Desmottes 2012-06-29 12:45:51 UTC
Created attachment 217614 [details] [review]
individual-widget: don't display unknown presence

Best to to not show anything than showing we don't know.
Comment 6 Guillaume Desmottes 2012-06-29 12:48:49 UTC
Created attachment 217615 [details] [review]
inline block_contact_dialog_show() into subscription-dialog.c

It's only used there now.
Comment 7 Xavier Claessens 2012-07-05 08:36:02 UTC
Review of attachment 217611 [details] [review]:

::: src/empathy-event-manager.c
@@ +1071,3 @@
+
+  dialog = empathy_subscription_dialog_new (individual, event->public.message);
+  empathy_window_present (GTK_WINDOW (dialog));

gtk_wiondow_present() is enough AFAIK. The empathy_window_present is for extra workspace tricks for the contact list IIRC.
Comment 8 Xavier Claessens 2012-07-05 08:38:03 UTC
The rest looks good, +1
Comment 9 Guillaume Desmottes 2012-07-06 09:30:14 UTC
Thanks, fixing and merging.
Comment 10 Guillaume Desmottes 2012-07-06 09:33:09 UTC
Attachment 217610 [details] pushed as 875ec0d - add empathy-subscription-dialog
Attachment 217611 [details] pushed as b020c79 - event-manager: use EmpathySubscriptionDialog
Attachment 217612 [details] pushed as 001cd2e - remove empathy_subscription_dialog_show()
Attachment 217614 [details] pushed as 20a4ffc - individual-widget: don't display unknown presence
Attachment 217615 [details] pushed as 7615fb3 - inline block_contact_dialog_show() into subscription-dialog.c