aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
Commit message (Expand)AuthorAgeFilesLines
* Only destroy block confirmation dialogs after we've read out the abusive stateDanielle Madeley2011-03-112-3/+3
* Hook up abusive argument into TpContactList backendDanielle Madeley2011-03-113-7/+12
* Initialize EmpathyContactManager before creating a new contact->Block menuitemChandni Verma2011-03-111-1/+2
* Use Contact Manager flags instead of Individual Manager flagsChandni Verma2011-03-091-8/+9
* Style fixes from reviewDanielle Madeley2011-03-082-2/+5
* Add confirmation dialog to RemoveDanielle Madeley2011-03-083-3/+109
* Add block confirmation to the authorise publication dialogDanielle Madeley2011-03-081-5/+17
* Add UI to blocking confirmation dialog for future "report as abusive" functionDanielle Madeley2011-03-081-3/+30
* Factor out common blocking confirmation dialogDanielle Madeley2011-03-083-26/+53
* contact-blocking-dialog: report errors to the userDanielle Madeley2011-03-081-3/+52
* Add Block button to the subscription authorization dialogDanielle Madeley2011-03-082-13/+61
* Add a confirmation dialog when you block a contact from the Contact menuDanielle Madeley2011-03-081-1/+42
* Add 'Delete and Block' as an option to the Remove Contact dialogDanielle Madeley2011-03-081-10/+24
* Add 'Block Contact' to empathy-contact-menuDanielle Madeley2011-03-083-2/+75
* Handle the case where there are no accounts with deny channelsDanielle Madeley2011-03-081-26/+62
* Don't need to prepare accounts separatelyDanielle Madeley2011-03-081-30/+11
* Provide autocompletion of known contacts in the entry boxDanielle Madeley2011-03-081-5/+47
* Add and remove contacts from deny listDanielle Madeley2011-03-082-12/+183
* Beginning of contact blocking dialogDanielle Madeley2011-03-084-0/+722
* Emit RESPONSE_APPLY on row-activatedDanielle Madeley2011-03-031-0/+12
* Contact Search Dialog: Search when enter is pressedDanielle Madeley2011-03-031-1/+3
* Change 'Add' to 'Add Contact'Danielle Madeley2011-03-031-1/+3
* Tweak ContactSearchDialog paddingDanielle Madeley2011-03-031-13/+17
* Only show the "Remember password" tickybox if we can do thatDanielle Madeley2011-03-031-1/+4
* Disable /part command for nowGuillaume Desmottes2011-02-251-0/+7
* Implementation of /PART command for MUCsChandni Verma2011-02-252-6/+59
* Updating empathy_tp_chat_leave() function in empathy-tp-chat APIChandni Verma2011-02-251-1/+1
* Indentation fixEmilio Pozuelo Monfort2011-02-251-21/+21
* Log window: free the entities together with the listEmilio Pozuelo Monfort2011-02-251-3/+1
* Log window: don't leak the accountEmilio Pozuelo Monfort2011-02-251-1/+1
* Unref the entity when we're doneEmilio Pozuelo Monfort2011-02-251-0/+2
* Port empathy to Telepathy logger 0.2.0Nicolas Dufresne2011-02-253-125/+120
* tls-dialog: destroy the dialog if the certificate is invalidated (#643186)Guillaume Desmottes2011-02-241-0/+13
* re-implement /query and /msg (#623682)Guillaume Desmottes2011-02-241-24/+38
* coding style fixesGuillaume Desmottes2011-02-212-2/+2
* Move farsight-using sources to srcEmilio Pozuelo Monfort2011-02-219-1770/+2
* Fiexd wrong title capitalization for checkboxMilo Casagrande2011-02-217-7/+7
* use champlain_view_ensure_layers_visible()Guillaume Desmottes2011-02-211-3/+1
* use champlain_marker_layer_new()Guillaume Desmottes2011-02-212-2/+2
* Port to champlain 0.10 (#642010)Guillaume Desmottes2011-02-212-25/+19
* empathy_theme_manager_dup_singleton: act as a proper dup singleton functionGuillaume Desmottes2011-02-181-2/+5
* Bug 637151 — Hide the user Individual from the contact listPhilip Withnall2011-02-186-22/+35
* empathy_protocol_chooser_create_account_settings: ensure that cm is always un...Guillaume Desmottes2011-02-171-4/+5
* rename empathy_theme_manager_get() to empathy_theme_manager_dup_singleton()Guillaume Desmottes2011-02-174-5/+11
* folks favorite API has changedGuillaume Desmottes2011-02-171-2/+2
* Always display favorite contacts (#592595)Guillaume Desmottes2011-02-171-1/+4
* empathy_cell_renderer_expander_render: draw using the proper state (#642098)Guillaume Desmottes2011-02-171-2/+13
* update copyrightGuillaume Desmottes2011-02-171-0/+1
* cell-renderer-expander: remove animation codeGuillaume Desmottes2011-02-171-163/+0
* disconnect the activate cb before detaching the menuGuillaume Desmottes2011-02-163-6/+6
* individual-widget: use empathy_context_menu_new()Guillaume Desmottes2011-02-161-4/+1
* individual-view: use empathy_context_menu_new()Guillaume Desmottes2011-02-161-4/+1
* contact-widget: use empathy_context_menu_new()Guillaume Desmottes2011-02-161-3/+1
* contact-list-view: use empathy_context_menu_new() (#642461)Guillaume Desmottes2011-02-161-5/+1
* theme-adium: use empathy_context_menu_new() and remove our hackGuillaume Desmottes2011-02-161-3/+1
* add empathy_context_menu_new()Guillaume Desmottes2011-02-162-0/+36
* only try reconnecting accounts if needed (#642358)Guillaume Desmottes2011-02-161-3/+14
* Merge remote branch 'glassrose/Reset-network-list-button-642264'Guillaume Desmottes2011-02-151-0/+33
|\
| * Reset network list buttonChandni Verma2011-02-151-0/+33
* | password-dialog: activate the dialog when the entry is activated (#642296)Guillaume Desmottes2011-02-141-0/+9
* | irc-network-chooser: recreate the default IRC network if needed (#641861)Guillaume Desmottes2011-02-141-1/+18
|/
* string-parser: properly handle if g_regex_new() failsGuillaume Desmottes2011-02-101-1/+13
* Move a couple of call-related functions to empathy-utils.hEmilio Pozuelo Monfort2011-02-102-10/+8
* EmpathyCallFactory -> EmpathyStreamedMediaFactoryEmilio Pozuelo Monfort2011-02-105-9/+6
* individual-view: properly unref the tooltip_widget when disposing (#641157)Guillaume Desmottes2011-02-031-6/+2
* contact-list-view: backport fixes from individual_view_popup_menu_idle_cbGuillaume Desmottes2011-02-031-2/+20
* individual-menu: ensure that the contact stays alive while the activate signa...Guillaume Desmottes2011-02-031-2/+4
* individual-view: detach the individual menu once it has been displayedGuillaume Desmottes2011-02-031-0/+20
* individual_view_popup_menu_idle_cb: remove useless sink/unrefGuillaume Desmottes2011-02-031-2/+0
* individual-widget: use priv->contact as that's our pointer on the TpContact nowGuillaume Desmottes2011-02-021-2/+1
* individual-widget: connect on the notify::client-types only onceGuillaume Desmottes2011-02-011-10/+14
* coding style fixGuillaume Desmottes2011-02-011-1/+1
* Merge branch 'muc-password'Jonny Lamb2011-02-011-8/+169
|\
| * chat: save room passwords in the keyring if requestedJonny Lamb2011-01-291-1/+11
| * chat: try to use a room password from the keyring or offer to save the passwordJonny Lamb2011-01-291-8/+159
* | Adjust for FolksHasPresence -> FolksPresenceOwnerTravis Reitter2011-02-015-36/+41
* | Adjust for FolksHasAvatar -> FolksAvatarOwnerTravis Reitter2011-02-011-1/+1
|/
* chat: add clear secondary icon to password entryJonny Lamb2011-01-281-0/+31
* chat: make the password entry growJonny Lamb2011-01-281-4/+4
* chat: display a spinner when attempting a MUC passwordJonny Lamb2011-01-281-46/+84
* Add Contact Search supportEmilio Pozuelo Monfort2011-01-284-0/+633
* Merge branch 'presence-manager-640532'Guillaume Desmottes2011-01-262-12/+11
|\
| * rename EmpathyIdle to EmpathyPresenceManager (#640532)Guillaume Desmottes2011-01-252-12/+11
* | empathy-chat: disable file transfer for nowGuillaume Desmottes2011-01-251-1/+0
* | add EMPATHY_CONTACT_FEATURE_FTGuillaume Desmottes2011-01-253-4/+8
|/
* account-widget-yahoo: remove server field (#634853)Guillaume Desmottes2011-01-242-33/+4
* Add calendar to the contact widget in order to simplify birthday selection (#...Vitaly Minko2011-01-241-9/+63
* Merge remote branch 'glassrose/Display-typing-icon-in-muc-contacts-list-609419'Guillaume Desmottes2011-01-181-1/+59
|\
| * Display typing icon in MUC contact-listChandni Verma2011-01-181-1/+59
* | Chat command nick modified to use RequestRename instead of SetAliasesChandni Verma2011-01-131-11/+15
* | Allow /nick command only in chatrooms that support nick renamingChandni Verma2011-01-131-14/+43
* | account-chooser: setup the combobox once the object has been constructed (#63...Guillaume Desmottes2011-01-111-1/+9
* | Pressing F2 opens the Edit Contact Information window for #586257Kushal Das2011-01-111-1/+22
* | Don't use deprecated gdk_app_launch_context_new()Emilio Pozuelo Monfort2011-01-111-3/+3
* | Don't use deprecated gdk_keyboard_grab/ungrabEmilio Pozuelo Monfort2011-01-111-8/+27
* | Port to GtkStyleContextEmilio Pozuelo Monfort2011-01-111-6/+12
* | Don't use deprecated gtk_paint_expander()Emilio Pozuelo Monfort2011-01-111-8/+6
* | Merge remote branch 'glassrose/accounts-supporting-chatrooms-only-603027'Guillaume Desmottes2011-01-102-0/+75
|\ \ | |/ |/|
| * Skip accounts which don't support rooms in "Manage Favorites" dialogChandni Verma2011-01-032-0/+75
* | Remove the composing listSjoerd Simons2010-12-292-0/+9
* | Simplify filter adding code by just using gdk_x11 functions instead of hoopsSjoerd Simons2010-12-291-10/+8
* | just include gcr.hGuillaume Desmottes2010-12-241-1/+1
* | libempathy-gtk: No need to 'egg' gcr-simple-certificate.[ch]Stef Walter2010-12-244-197/+1
* | Fix build warnings for uninitialized variablesXavier Claessens2010-12-231-1/+1
* | account-widget: use g_app_info_launch() instead of gdk_spawn_on_screen() (#63...Guillaume Desmottes2010-12-231-14/+30
* | gdk_xid_table_lookup has been deprecated (#637855)Guillaume Desmottes2010-12-231-1/+2
* | Don't display any contact menu for muc chatsGuillaume Desmottes2010-12-221-6/+0
* | Fix build warningXavier Claessens2010-12-211-2/+2
* | password-dialog: make OK insensitive unless there's a password setJonny Lamb2010-12-171-5/+12
* | Make empathy-persona-view include empathy-ui-utilsSjoerd Simons2010-12-171-0/+1
* | remove useless paranthesisGuillaume Desmottes2010-12-151-3/+3
* | persona-view: use new GTK+ style API (#636500)Guillaume Desmottes2010-12-151-11/+10
* | individual-view: use new GTK+ style API (#636500)Guillaume Desmottes2010-12-151-11/+10
* | contact-list-view: use new GTK+ style API (#636500)Guillaume Desmottes2010-12-151-10/+9
* | factor out empathy_make_color_whiter()Guillaume Desmottes2010-12-153-4/+14
* | account-widget: use new GTK+ style API (#636500)Guillaume Desmottes2010-12-151-12/+16
* | status-preset-dialog: use new GTK+ style API (#636500)Guillaume Desmottes2010-12-151-4/+4
* | chat-text-view: use new GTK+ style API (#636500)Guillaume Desmottes2010-12-151-1/+1
* | video-widget: use new GTK+ style API (#636500)Guillaume Desmottes2010-12-151-6/+4
* | password-dialog: destroy the dialog if the handler is invalidatedJonny Lamb2010-12-151-0/+11
* | Merge branch 'sasl-gui'Jonny Lamb2010-12-159-32/+406
|\ \
| * | account-widget: add Remember Password widgets for all the other protocolsJonny Lamb2010-12-107-24/+281
| * | account-widget: only show Remember Password ticky box if the CM supports SASLJonny Lamb2010-12-101-1/+7
| * | account-settings: don't block notify::ready on getting a passwordJonny Lamb2010-12-101-0/+36
| * | account-widget: handle the remember password widget with the simple widgetJonny Lamb2010-12-102-13/+57
| * | password-dialog: re-enable showing the Remember password check buttonJonny Lamb2010-12-081-7/+0
| * | account-widget: hook up the remember password toggle buttonJonny Lamb2010-12-081-0/+38
* | | Bug 637097 — Port to latest folks API changesPhilip Withnall2010-12-147-41/+53
* | | Prevent premature finalisation of an EmpathyPersonaStore in certain casesPhilip Withnall2010-12-131-0/+7
* | | Bug 631096 — Should not mention "meta contacts" in UIPhilip Withnall2010-12-132-7/+11
* | | Bug 636700 — Add an extra warning when deleting a metacontactPhilip Withnall2010-12-131-4/+37
|/ /
* | empathy_subscription_dialog_show: show contact detailsGuillaume Desmottes2010-12-071-1/+2
* | Remove Ovi chat profileGuillaume Desmottes2010-12-073-155/+0
* | add services_infos containing infos regarding servicesGuillaume Desmottes2010-12-071-21/+24
* | hide jabber example by default so we just have to show the one we wantGuillaume Desmottes2010-12-072-6/+4
* | account_widget_get_service: check Service for Facebook and GTalk tooGuillaume Desmottes2010-12-071-6/+11
* | empathy_account_widget_get_default_display_name: special case Ovi as wellGuillaume Desmottes2010-12-071-0/+8
* | more use of account_widget_get_service()Guillaume Desmottes2010-12-071-30/+4
* | add account_widget_get_service() and an enum to represent servicesGuillaume Desmottes2010-12-071-13/+40
* | add account widget for OviGuillaume Desmottes2010-12-072-3/+149
* | account-widget: generalise facebook suffix codeGuillaume Desmottes2010-12-071-15/+31
* | add Ovi chat profile (#630146)Guillaume Desmottes2010-12-071-0/+15
* | Merge branch 'sasl'Jonny Lamb2010-12-073-0/+393
|\ \ | |/ |/|
| * password-dialog: stop using GET_PRIVJonny Lamb2010-12-071-9/+7
| * password-dialog: small style change to please make checkJonny Lamb2010-12-071-2/+2
| * password-dialog: center the dialogJonny Lamb2010-12-061-0/+2
| * password-dialog: don't display "Remember password" for nowJonny Lamb2010-12-061-0/+7
| * auth-client: move the password dialog into a new fileJonny Lamb2010-12-033-0/+386
* | gdk_x11_drawable_get_xdisplay() has been renamed, so let's use the specific m...Guillaume Desmottes2010-12-031-1/+1
* | Check if apply button has a top level window before calling gtk_widget_grab_d...Guillaume Desmottes2010-12-011-2/+11
|/
* empathy-spell: implement _get_enabled_language_codes with --disable-spellJonny Lamb2010-12-011-0/+7
* empathy-spell: updated _get_suggestions disabled implementationJonny Lamb2010-12-011-1/+2
* update copyrightsGuillaume Desmottes2010-11-301-1/+1
* remove old definesGuillaume Desmottes2010-11-301-3/+0
* EmpathyChat::new-message: tell if the message is a pending one or notGuillaume Desmottes2010-11-301-6/+10
* Stop calling gtk_menu_detach()Guillaume Desmottes2010-11-302-6/+0
* empathy_sound_manager_dup_singleton: add G_LIKELYGuillaume Desmottes2010-11-301-1/+1
* fix typo in commentGuillaume Desmottes2010-11-301-1/+1
* sound-manager: update copyrightGuillaume Desmottes2010-11-301-1/+1
* sound-manager: cache the sound GSettingsGuillaume Desmottes2010-11-301-24/+15
* sound-manager: move repeating_sounds to EmpathySoundManagerPrivateGuillaume Desmottes2010-11-301-62/+75
* move sound functions to EmpathySoundManager methodsGuillaume Desmottes2010-11-302-16/+37
* add EmpathySoundManager stub object (#636067)Guillaume Desmottes2010-11-302-0/+60
* move empathy-sound to empathy-sound-managerGuillaume Desmottes2010-11-303-20/+20
* theme_adium_parse_body: use the cache GSettings chatGuillaume Desmottes2010-11-291-6/+6
* notify-manager: cache the notification GSettingsGuillaume Desmottes2010-11-291-15/+12
* avatar-chooser: cache the UI GSettingsGuillaume Desmottes2010-11-291-7/+7
* chat-text-view: cache the chat GSettingsGuillaume Desmottes2010-11-291-5/+5
* empathy-chat-text-view: rename gsettings to gsettings_desktopGuillaume Desmottes2010-11-291-5/+6
* properly manage the reference of the pixbuf returned by empathy_pixbuf_avatar...Guillaume Desmottes2010-11-242-2/+6
* empathy_individual_view_get_group_menu: don't leak the groupGuillaume Desmottes2010-11-241-0/+1
* rename empathy_individual_view_get_selected_group to empathy_individual_view_...Guillaume Desmottes2010-11-242-7/+4
* log_window_get_messages_for_date: don't leak chat_id and accountGuillaume Desmottes2010-11-241-0/+3
* smiley-manager: clean up memory management of the pathGuillaume Desmottes2010-11-241-4/+5
* chat_log_filter: don't leak EmpathyMessageGuillaume Desmottes2010-11-241-0/+1
* Merge branch 'chat-resize-635022'Guillaume Desmottes2010-11-221-5/+25
|\
| * chat: add a timer before saving the hpane positionGuillaume Desmottes2010-11-181-5/+25
* | Merge remote branch 'glassrose/link_unfocussed_626560'Danielle Madeley2010-11-221-0/+11
|\ \
| * | Label removed form list of focusable widgetsChandni Verma2010-11-221-0/+11
* | | individual_avatar_pixbuf_received_cb: don't leak the itersGuillaume Desmottes2010-11-181-0/+2
* | | factor out free_itersGuillaume Desmottes2010-11-181-7/+10
* | | cell_renderer_text_set_property: don't leak client types (#635105)Guillaume Desmottes2010-11-181-0/+1
* | | individual_store_name_sort_func: don't leak namesGuillaume Desmottes2010-11-181-0/+2
| |/ |/|
* | remove EMPATHY_CONTACT_LIST_STORE_COL_CLIENT_TYPESGuillaume Desmottes2010-11-181-1/+0
* | Merge branch 'bug-547658'Emilio Pozuelo Monfort2010-11-178-47/+230
|\ \ | |/ |/|
| * Remove spurious commentEmilio Pozuelo Monfort2010-11-171-1/+0
| * Display the phone next to the statusEmilio Pozuelo Monfort2010-11-173-42/+34
| * Only check for presence in presence-enabled personas 2.0Emilio Pozuelo Monfort2010-11-161-1/+7
| * empathy-individual-store: only check for presence in presence-enabled personasJonny Lamb2010-11-161-1/+7
| * individual-widget: show a "on a phone" label in the individual viewJonny Lamb2010-11-164-44/+146
| * contact: enable showing a phone next to contacts who are on phonesJonny Lamb2010-11-163-0/+78
* | Merge remote branch 'vminko/fix-634688-v3'Guillaume Desmottes2010-11-161-0/+16
|\ \
| * | Need to set preferred height of the search bar manually (#634688).Vitaly Minko2010-11-161-0/+16
| |/
* | fix identationGuillaume Desmottes2010-11-161-1/+1
* | use gsettings version of the document-font-name key (#626810)Guillaume Desmottes2010-11-162-44/+26
|/
* Merge branch 'bug-607146'Emilio Pozuelo Monfort2010-11-151-0/+20
|\
| * Make <Enter> on the account name try to log inEmilio Pozuelo Monfort2010-11-151-0/+20
* | Merge branch 'trivia'Guillaume Desmottes2010-11-151-0/+3
|\ \
| * | individual_store_contact_sort: account is not supposed to be NULLGuillaume Desmottes2010-11-151-0/+3
* | | Merge remote branch 'zdra/configure'Guillaume Desmottes2010-11-151-5/+1
|\ \ \
| * | | Group all harddeps in one pkg-config callXavier Claessens2010-11-151-5/+1
| |/ /
* | | Merge branch 'bug-595305'Emilio Pozuelo Monfort2010-11-152-1/+68
|\ \ \ | |/ / |/| |
| * | Add a close button to Previous ConversationsEmilio Pozuelo Monfort2010-11-152-1/+68
| |/
* | Merge remote branch 'pwith/634754-folks-api-changes'Guillaume Desmottes2010-11-155-26/+29
|\ \
| * | Stop using removed Individual convenience methods from folksPhilip Withnall2010-11-135-26/+29
| |/
* | Merge remote branch 'vminko/fix-633481-v2'Guillaume Desmottes2010-11-158-75/+251
|\ \ | |/ |/|
| * Make AccountChooser-related code simpler and clearer (re #633481).Vitaly Minko2010-11-122-34/+31
| * Make AccountChooser filters asynchronous to let them handle newly connected a...Vitaly Minko2010-11-118-75/+254
* | cell-renderer-text: implement get_preferred_height_for_width instead of get_s...Guillaume Desmottes2010-11-121-32/+20
* | input-text-view: use get_preferred_height instead of size_requestGuillaume Desmottes2010-11-111-14/+11
* | move size-requst handling in input-text-viewGuillaume Desmottes2010-11-112-39/+48
* | add EmpathyInputTextViewGuillaume Desmottes2010-11-114-8/+129
* | empathy-chat: remove the size-request hack (#633835)Guillaume Desmottes2010-11-111-51/+0
* | Display text in verbatim (#625745)Vitaly Minko2010-11-111-0/+6
|/
* empathy_subscription_dialog_show: display user's message if any (#630707)Guillaume Desmottes2010-11-092-1/+25
* coding style fixesEMPATHY_2_91_2Guillaume Desmottes2010-11-082-3/+3
* Merge branch 'preset-581029'Guillaume Desmottes2010-11-081-2/+2
|\
| * Don't use 'Preset' in the UI (#581029)Guillaume Desmottes2010-10-271-2/+2
* | Add fields which are supported but not in the vCardGuillaume Desmottes2010-11-031-0/+58
* | split filling of details_to_set and adding the widgetsGuillaume Desmottes2010-11-031-13/+20
* | contact_widget_details_update_edit: iterate over the fields returned by tp_co...Guillaume Desmottes2010-11-031-62/+11
* | log an error if SetContactInfo() failsGuillaume Desmottes2010-11-031-1/+19
* | field_value_is_empty: check that all the values are emptyGuillaume Desmottes2010-11-031-1/+10
* | field_spec_match_field: check that parameters are matching as well (#630421)Guillaume Desmottes2010-11-031-1/+15
* | factor out field_spec_match_field()Guillaume Desmottes2010-11-031-1/+8
* | Escape URL itself along with the title (#616339)Vitaly Minko2010-11-021-7/+11
* | String parser is changed in order not to break URLs at apostrophes.Vitaly Minko2010-11-011-6/+6
* | Allow to drop contacts on the group names (#619961)Vitaly Minko2010-10-281-1/+1
* | Merge remote branch 'vminko/fix-612205-v2'Guillaume Desmottes2010-10-281-0/+25
|\ \
| * | Copy topic selection manually since Ctrl-C is bound to the menu item.Vitaly Minko2010-10-281-0/+25
| |/
* | rename timeout_id to auto_scroll_timeout_idGuillaume Desmottes2010-10-281-5/+5
* | move AutoScrollData to privGuillaume Desmottes2010-10-281-21/+19
* | Use GTK3 APIGuillaume Desmottes2010-10-281-6/+10
* | Add auto scrolling when drag-and-dropping contacts (#619858).Vitaly Minko2010-10-281-0/+54
|/
* Fixing incorrect indentation.Vitaly Minko2010-10-251-4/+4
* Disable meaningless popup menu items in the contact menu (#573283).Vitaly Minko2010-10-231-3/+13
* gtk_text_view_get_vadjustment() has been removedGuillaume Desmottes2010-10-221-3/+3
* add a new popup-menu item in the chat window allowing to add words to diction...Vitaly Minko2010-10-223-2/+165
* Don't assume account will exist when accessing storage restrictionsDanielle Madeley2010-10-211-5/+9
* Merge remote branch 'vminko/fix-632024-v2'Guillaume Desmottes2010-10-182-4/+17
|\
| * Add an entry in the View menu to search for contacts (#632024).Vitaly Minko2010-10-182-4/+17
* | individual-widget: set xalign on the status message (#632434)Guillaume Desmottes2010-10-181-0/+1
* | empathy_notify_manager_notification_is_enabled: properly check the EMPATHY_PR...Guillaume Desmottes2010-10-181-1/+1
* | Port empathy-status-preset-dialog to GtkComboBoxDanielle Madeley2010-10-183-4/+5
* | Port empathy-presence-chooser to GtkComboBoxDanielle Madeley2010-10-182-9/+21
* | Merge branch 'external-accounts'Danielle Madeley2010-10-181-26/+146
|\ \
| * | Access Account.I.Storage properties via TpAccountDanielle Madeley2010-10-081-35/+38
| * | Support Account.Interface.StorageDanielle Madeley2010-10-081-26/+143
* | | Use Folks to check if a TpConnection can alias and group personas.Travis Reitter2010-10-161-5/+2
* | | Use Folks to check if a TpConnection can add personas.Travis Reitter2010-10-161-2/+1