aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Depends on gcr 2.91.4Guillaume Desmottes2010-12-241-1/+2
* | 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
* | Merge remote branch 'glassrose/enable-disable-accounts-popup-609568'Danielle Madeley2010-12-241-0/+95
|\ \
| * | Popup menu feature to quickly enable/disable an account.Chandni Verma2010-12-241-0/+95
* | | Added UG translationGheyret T.Kenji2010-12-241-392/+439
* | | remove released flagGuillaume Desmottes2010-12-231-1/+1
* | | prepare 2.91.4.2EMPATHY_2_91_4_2Guillaume Desmottes2010-12-233-1/+7
* | | Merge branch 'release.py'Guillaume Desmottes2010-12-232-2/+13
|\ \ \
| * | | prepare 2.91.4.1EMPATHY_2_91_4_1Guillaume Desmottes2010-12-232-2/+13
* | | | Fix build warnings for uninitialized variablesXavier Claessens2010-12-233-3/+3
|/ / /
* | | account-widget: use g_app_info_launch() instead of gdk_spawn_on_screen() (#63...Guillaume Desmottes2010-12-231-14/+30
* | | main-window: use g_app_info_launch() instead of gdk_spawn_on_screen() (#637854)Guillaume Desmottes2010-12-231-7/+16
* | | accounts-dialog: use g_app_info_launch() instead of gdk_spawn_on_screen() (#6...Guillaume Desmottes2010-12-231-14/+25
* | | 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
* | | chat-window: unsensitive the Contact menu if there is no submenu (#637799)Guillaume Desmottes2010-12-221-2/+8
* | | account-settings: only remove the MC password param if set in the keyring OKJonny Lamb2010-12-221-12/+30
* | | account-settings: use tp_account_get_path_suffixJonny Lamb2010-12-221-5/+3
* | | account-settings: add a comment saying what to remove when purging migration ...Jonny Lamb2010-12-221-1/+2
* | | account-settings: move the migration code to another functionJonny Lamb2010-12-221-45/+54
* | | account-settings: migrate passwords from MC to gk ourselvesJonny Lamb2010-12-221-0/+47
* | | disable maintainer mode for nowGuillaume Desmottes2010-12-211-2/+3
* | | Fix build warningXavier Claessens2010-12-211-2/+2
* | | remove released flagGuillaume Desmottes2010-12-201-1/+1
* | | prepare 2.91.4 releaseEMPATHY_2_91_4Guillaume Desmottes2010-12-202-3/+28
* | | Turn off sliced-threads, some implementations have problems with decoding itSjoerd Simons2010-12-201-0/+1
* | | [l10n] Updated Estonian translationMattias Põldaru2010-12-201-32/+64
* | | Updated Esperanto translationKristjan SCHMIDT2010-12-191-955/+1498
* | | Updated Hebrew translation.Yaron Shahrabani2010-12-191-113/+136
* | | Updated Spanish TranslationDaniel Mustieles2010-12-181-9/+5
* | | Updated Norwegian bokmål translationKjartan Maraas2010-12-171-166/+194
* | | 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
* | | Updated Spanish translationDaniel Mustieles2010-12-161-166/+206
* | | Merge branch 'gtk-style-636654'Guillaume Desmottes2010-12-1610-56/+65
|\ \ \
| * | | depends on GTK+ 2.91.6 as we use the new style APIGuillaume Desmottes2010-12-151-1/+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
* | | | use tp_account_get_path_suffix()Guillaume Desmottes2010-12-151-4/+1
* | | | show the account UI even if the selected account doesn't existGuillaume Desmottes2010-12-151-0/+2
* | | | always set account_manager_preparedGuillaume Desmottes2010-12-151-1/+2
* | | | get the value of selected_account_name in the callback (#637307)Guillaume Desmottes2010-12-151-4/+3
* | | | empathy-accounts: no need to get argv, we don't use itGuillaume Desmottes2010-12-151-7/+0
|/ / /
* | | password-dialog: destroy the dialog if the handler is invalidatedJonny Lamb2010-12-151-0/+11
* | | keyring: change display name for passwords to be more human-readableJonny Lamb2010-12-151-1/+2
* | | server-sasl-handler: add more debugging and only call Close in Status_SucceededJonny Lamb2010-12-151-1/+5
* | | Merge branch 'sasl-gui'Jonny Lamb2010-12-1521-138/+1161
|\ \ \
| * | | main-window: s/Cancel/Disconnect/ when not giving a passwordJonny Lamb2010-12-151-1/+1
| * | | main-window: don't use _full functions where not necessaryJonny Lamb2010-12-151-4/+1
| * | | main-window: document what the key and value types are for hash tablesJonny Lamb2010-12-151-0/+4
| * | | event-manager: use tp_clear_objectJonny Lamb2010-12-151-9/+2
| * | | auth-factory: add a comment as to why we're also an approverJonny Lamb2010-12-151-0/+6
| * | | account-settings: use tp_clear_object in disposeJonny Lamb2010-12-151-19/+5
| * | | configure: depend on the newest tp-glib for the new auth types stuffJonny Lamb2010-12-131-1/+1
| * | | 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: add _supports_sasl functionJonny Lamb2010-12-102-0/+10
| * | | account-settings: don't block notify::ready on getting a passwordJonny Lamb2010-12-102-6/+55
| * | | status-icon: blink when we get a password requestJonny Lamb2010-12-102-5/+6
| * | | auth-factory: become an Observer and claim auth channels where necessaryJonny Lamb2010-12-103-57/+229
| * | | main-window: display an info bar approving or rejecting the auth channelJonny Lamb2010-12-102-1/+161
| * | | notifications-approver: don't show notifications for auth eventsJonny Lamb2010-12-101-0/+10
| * | | event-manager: become an approver for auth channelsJonny Lamb2010-12-102-6/+85
| * | | event-manager: add the account to the EmpathyEvent structJonny Lamb2010-12-102-13/+23
| * | | account-widget: handle the remember password widget with the simple widgetJonny Lamb2010-12-102-13/+57
| * | | account-settings: don't call TpAccount functions if we've not created it yetJonny Lamb2010-12-081-3/+9
| * | | 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
| * | | account-settings: add support for saving the password in the keyring ourselvesJonny Lamb2010-12-081-3/+161
| * | | account-settings: store the TpProtocol object and notify::ready when it's pre...Jonny Lamb2010-12-081-3/+47
* | | | remove released flagGuillaume Desmottes2010-12-141-1/+1
* | | | prepare 2.91.3.1EMPATHY_2_91_3_1Guillaume Desmottes2010-12-142-2/+42
* | | | Updated Hebrew translation.Yaron Shahrabani2010-12-141-65/+74
* | | | Bug 637097 — Port to latest folks API changesPhilip Withnall2010-12-1410-52/+68
* | | | Compile with --without-ca-fileWill Thompson2010-12-131-0/+2
* | | | 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
* | | | remove released flag accidentally set in previous commitGuillaume Desmottes2010-12-131-1/+1
* | | | main-window: add a tooltip on connection error info bars (#626507)Robert Sajdok2010-12-132-1/+2
* | | | Updated Norwegian bokmål translationKjartan Maraas2010-12-131-207/+225
* | | | Update British English translationPhilip Withnall2010-12-121-584/+672
* | | | Updated Slovenian translationMatej Urbančič2010-12-121-273/+291
* | | | Updated Spanish translationDaniel Mustieles2010-12-111-205/+221
* | | | Updated Galician translationsFran Diéguez2010-12-111-226/+242
* | | | Updated Traditional Chinese translation(Hong Kong and Taiwan)Cheng-Chia Tseng2010-12-092-850/+960
|/ / /
* | | empathy_subscription_dialog_show: show contact detailsGuillaume Desmottes2010-12-071-1/+2
* | | Updated Hebrew translation.Yaron Shahrabani2010-12-071-202/+218
* | | Remove Ovi chat profileGuillaume Desmottes2010-12-074-156/+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-072-0/+16
* | | Merge branch 'sasl'Jonny Lamb2010-12-0715-15/+1431
|\ \ \
| * | | server-sasl-handler: shorten very long linesJonny Lamb2010-12-071-4/+4
| * | | server-sasl-handler: stop using GET_PRIVJonny Lamb2010-12-071-18/+15
| * | | 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
| * | | po: add password-dialog to POTFILES.inJonny Lamb2010-12-071-0/+1
| * | | keyring: change schema to be incompatible with current MCJonny Lamb2010-12-071-9/+9
| * | | password-dialog: center the dialogJonny Lamb2010-12-061-0/+2
| * | | password-dialog: don't display "Remember password" for nowJonny Lamb2010-12-061-0/+7
| * | | server-sasl-handler: handle invalid SASL statusesJonny Lamb2010-12-061-0/+7
| * | | keyring: allow set and delete password to have NULL callbacksJonny Lamb2010-12-061-2/+0
| * | | keyring: add a delete_password functionJonny Lamb2010-12-062-0/+102
| * | | server-sasl-handler: save the password if requestedJonny Lamb2010-12-061-1/+21
| * | | keyring: add set_password_{async,finish} functionsJonny Lamb2010-12-062-6/+87
| * | | server-sasl-handler: make a GAsyncInitable and get the passwordJonny Lamb2010-12-064-23/+193
| * | | keyring: add simple keyring helperJonny Lamb2010-12-063-0/+154
| * | | auth-client: move the password dialog into a new fileJonny Lamb2010-12-034-176/+390
| * | | auth-client: grab the keyboard focus when popping up the password dialogJonny Lamb2010-12-031-0/+73
| * | | auth-client: improve the password request dialogJonny Lamb2010-12-033-13/+74
| * | | server-sasl-handler: add an account propertyJonny Lamb2010-12-033-4/+38
| * | | auth-client: listen for new sasl handlers and pop up a password dialogJonny Lamb2010-12-011-2/+69
| * | | auth-factory: create ServerSASLHandlers and signal them appearingJonny Lamb2010-12-011-12/+78
| * | | server-sasl-handler: addedJonny Lamb2010-12-013-0/+337
| * | | auth-factory: add EmpathyAuthFactory::new-server-sasl-handlerJonny Lamb2010-12-011-0/+10
| * | | auth-factory: also handle auth channelsJonny Lamb2010-12-012-1/+16
| * | | debug: add SASL debug flag and keyJonny Lamb2010-12-012-0/+2
| * | | configure: depend on tp-glib >= 0.13.7 for tp-glib codegenJonny Lamb2010-12-011-1/+1
* | | | Point to #empathy instead of #telepathyEmilio Pozuelo Monfort2010-12-061-1/+1
| |_|/ |/| |
* | | Fix uninitialized use of a variableSjoerd Simons2010-12-051-1/+1
| |/ |/|
* | gdk_x11_drawable_get_xdisplay() has been renamed, so let's use the specific m...Guillaume Desmottes2010-12-031-1/+1
* | chatroom-mamanger: monitor for file changes (#636360)Guillaume Desmottes2010-12-031-13/+74
* | Fix another articleGabor Kelemen2010-12-031-1/+1
* | Fix articleGabor Kelemen2010-12-031-1/+1
* | rename unused empathy_chatroom_manager_chat_handled()Guillaume Desmottes2010-12-022-37/+0
* | chatroom-manager: use a room channel Observer (#636202)Guillaume Desmottes2010-12-021-0/+107
* | chat-manager: stop telling the chat mgr about handled roomsGuillaume Desmottes2010-12-021-18/+0
* | remove empathy_chatroom_manager_get_count()Guillaume Desmottes2010-12-022-31/+0
* | chatroom-manager: unify coding styleGuillaume Desmottes2010-12-022-289/+304
* | Merge branch 'irc-grab-636203'Guillaume Desmottes2010-12-011-2/+11
|\ \
| * | Check if apply button has a top level window before calling gtk_widget_grab_d...Guillaume Desmottes2010-12-011-2/+11
| |/
* / tp-contact-factory: request avatar featureGuillaume Desmottes2010-12-011-0/+1
|/
* 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-302-2/+2
* remove old definesGuillaume Desmottes2010-11-301-3/+0
* chat-window: don't display notifications for pending messages (#635513)Guillaume Desmottes2010-11-301-1/+5
* EmpathyChat::new-message: tell if the message is a pending one or notGuillaume Desmottes2010-11-302-6/+11
* 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-306-32/+85
* add EmpathySoundManager stub object (#636067)Guillaume Desmottes2010-11-302-0/+60
* move empathy-sound to empathy-sound-managerGuillaume Desmottes2010-11-308-25/+25
* remove released flagGuillaume Desmottes2010-11-301-1/+1
* add empathy-notifications-approver.c to POTFILES.inEMPATHY_2_91_3Guillaume Desmottes2010-11-301-0/+1
* prepare 2.91.3 releaseGuillaume Desmottes2010-11-302-2/+62
* event-manager: cache the UI GSettingsGuillaume Desmottes2010-11-291-11/+7
* event-manager: cache the notifications GSettingsGuillaume Desmottes2010-11-291-4/+8
* 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
* chat-window: cache the UI GSettingsGuillaume Desmottes2010-11-291-4/+4
* chat-window: cache the notifications GSettingsGuillaume Desmottes2010-11-291-6/+4
* fix typoGuillaume Desmottes2010-11-291-1/+1
* Initialize libnotify properly to prevent crashesSjoerd Simons2010-11-281-0/+6
* Debug window: Correct spelling of "misson-control"Will Thompson2010-11-271-1/+1
* Merge remote branch 'glassrose/full_room_menu_never_insensitivated-597043'Danielle Madeley2010-11-261-2/+14
|\
| * Only the required submenus of 'Room' menu are updated, not the entire menu.Chandni Verma2010-11-261-2/+14
* | Merge branch 'notifications-635500'Guillaume Desmottes2010-11-255-259/+435
|\ \
| * | Clean up the way we keep references on notificationsGuillaume Desmottes2010-11-231-10/+13
| * | use tp_g_signal_connect_objectGuillaume Desmottes2010-11-231-6/+6
| * | fix commentGuillaume Desmottes2010-11-231-1/+1
| * | empathy.c: instantiate a EmpathyNotificationsApproverGuillaume Desmottes2010-11-231-0/+6
| * | Move notifications code from status-icon to notifications-approver (#635500)Guillaume Desmottes2010-11-232-259/+260
| * | add EmpathyNotificationsApproverGuillaume Desmottes2010-11-233-0/+166
* | | update for Punjabi by A S AlamA S Alam2010-11-251-321/+380
| |/ |/|
* | 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
* | empathy_message_from_tpl_log_entry: don't leak receiver and senderGuillaume Desmottes2010-11-241-6/+12
* | chat_log_filter: don't leak EmpathyMessageGuillaume Desmottes2010-11-241-0/+1
|/
* empathy-av: early return if already activatedGuillaume Desmottes2010-11-231-18/+18
* empathy-chat: register the Handler when the app is activatedGuillaume Desmottes2010-11-231-9/+15
* empathy-chat: don't use G_APPLICATION_IS_SERVICEGuillaume Desmottes2010-11-231-1/+1
* Fix miss spelling quadrigraphs in the configure.ac file (#635262)Nishio Futoshi2010-11-221-1/+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
* | | Updated Hebrew translation.Yaron Shahrabani2010-11-211-180/+184
* | | Updated Tamil translationDr.T.Vasudevan2010-11-211-2/+1
* | | Updated Norwegian bokmål translationKjartan Maraas2010-11-201-300/+342
* | | Added UG translationGheyret T.Kenji2010-11-201-190/+194
* | | Updated Galician translationsFran Diéguez2010-11-201-104/+108
* | | Updated Spanish translationDaniel Mustieles2010-11-191-108/+112
* | | [l10n] Updated Estonian translationIvar Smolin2010-11-191-1/+4
* | | 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
* | | Updated Tamil translationDr.T.Vasudevan2010-11-181-1/+4
* | | Updated Tamil translationDr.T.Vasudevan2010-11-181-544/+632
| |/ |/|
* | set do-lost property on the gstrtpjitterbuffer elementGuillaume Desmottes2010-11-181-0/+3
* | remove EMPATHY_CONTACT_LIST_STORE_COL_CLIENT_TYPESGuillaume Desmottes2010-11-181-1/+0
* | Merge branch 'bug-547658'Emilio Pozuelo Monfort2010-11-1711-48/+283
|\ \
| * | 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-166-1/+131
* | | chat-window: cache the 'chat' gsettingsGuillaume Desmottes2010-11-171-5/+5
| |/ |/|
* | 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
* | | Merge branch 'desktop-schema-626810'Guillaume Desmottes2010-11-165-54/+29
|\ \ \ | |/ / |/| |
| * | fix identationGuillaume Desmottes2010-11-161-1/+1
| * | remove gconf depGuillaume Desmottes2010-11-161-2/+0
| * | accounts-panel: remove gconf bits (#634595)Guillaume Desmottes2010-11-161-9/+0
| * | use gsettings version of the document-font-name key (#626810)Guillaume Desmottes2010-11-163-44/+29
| * | depend on gsettings-desktop-schemasGuillaume Desmottes2010-11-161-0/+1
* | | [l10n] Updated Estonian translationIvar Smolin2010-11-161-23/+67
|/ /
* | don't set fill on the box containing buttonsGuillaume Desmottes2010-11-151-0/+1
* | use gtk_box_pack_start() to pack our widget to the dialog (#634912)Guillaume Desmottes2010-11-151-1/+1
|/
* 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
* | Make ca-certs location configurable (#634197)Brian Pepple2010-11-152-1/+34
* | 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-156-26/+6
|\ \ \
| * | | Group all harddeps in one pkg-config callXavier Claessens2010-11-156-26/+6
* | | | Merge branch 'bug-595305'Emilio Pozuelo Monfort2010-11-152-1/+68
|\ \ \ \
| * | | | Add a close button to Previous ConversationsEmilio Pozuelo Monfort2010-11-152-1/+68
| | |_|/ | |/| |
* | | | Updated Galician help translationsFran Diéguez2010-11-151-105/+130
* | | | pofilter fixes for the Finnish translation, update translator-creditsVille-Pekka Vainio2010-11-151-64/+66
| |/ / |/| |
* | | Updated galician help translationsFran Diéguez2010-11-151-1/+44
| |/ |/|
* | bump folks dep to 0.3.2Guillaume Desmottes2010-11-151-1/+1
* | Merge remote branch 'pwith/634754-folks-api-changes'Guillaume Desmottes2010-11-156-27/+30
|\ \