aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'glassrose/accounts-supporting-chatrooms-only-603027'Guillaume Desmottes2011-01-102-71/+2
|\
| * Skip accounts which don't support rooms in "Manage Favorites" dialogChandni Verma2011-01-032-71/+2
* | Remove the chats_new_msg list from EmpathyChatWindowSjoerd Simons2010-12-291-17/+9
* | Remove the composing listSjoerd Simons2010-12-291-15/+2
* | Highlight both the tab and the menu labelSjoerd Simons2010-12-291-2/+6
* | Fix lines > 80 charsSjoerd Simons2010-12-291-2/+4
* | Prevent potential freeing of unitialized dataSjoerd Simons2010-12-291-4/+4
* | libempathy: Store certificate exceptions in gnome-keyring.Stef Walter2010-12-241-4/+10
* | libempathy: Use trust assertions instead of certificate directories.Stef Walter2010-12-241-0/+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
| |/
* | Fix build warnings for uninitialized variablesXavier Claessens2010-12-232-2/+2
* | 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
* | chat-window: unsensitive the Contact menu if there is no submenu (#637799)Guillaume Desmottes2010-12-221-2/+8
* | 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
* | Merge branch 'sasl-gui'Jonny Lamb2010-12-156-25/+279
|\ \
| * | 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
| * | status-icon: blink when we get a password requestJonny Lamb2010-12-102-5/+6
| * | 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
* | | main-window: add a tooltip on connection error info bars (#626507)Robert Sajdok2010-12-131-0/+1
|/ /
* | Merge branch 'sasl'Jonny Lamb2010-12-071-2/+25
|\ \ | |/ |/|
| * server-sasl-handler: make a GAsyncInitable and get the passwordJonny Lamb2010-12-061-3/+6
| * auth-client: move the password dialog into a new fileJonny Lamb2010-12-031-176/+4
| * 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-031-11/+63
| * auth-client: listen for new sasl handlers and pop up a password dialogJonny Lamb2010-12-011-2/+69
* | chat-manager: stop telling the chat mgr about handled roomsGuillaume Desmottes2010-12-021-18/+0
|/
* update copyrightsGuillaume Desmottes2010-11-301-1/+1
* 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-301-0/+1
* move sound functions to EmpathySoundManager methodsGuillaume Desmottes2010-11-304-16/+48
* move empathy-sound to empathy-sound-managerGuillaume Desmottes2010-11-304-4/+4
* event-manager: cache the UI GSettingsGuillaume Desmottes2010-11-291-11/+7
* event-manager: cache the notifications GSettingsGuillaume Desmottes2010-11-291-4/+8
* chat-window: cache the UI GSettingsGuillaume Desmottes2010-11-291-4/+4
* chat-window: cache the notifications GSettingsGuillaume Desmottes2010-11-291-6/+4
* 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
* | 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
|/
* 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
* chat-window: cache the 'chat' gsettingsGuillaume Desmottes2010-11-171-5/+5
* accounts-panel: remove gconf bits (#634595)Guillaume Desmottes2010-11-161-9/+0
* 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
* Group all harddeps in one pkg-config callXavier Claessens2010-11-151-6/+0
* Make AccountChooser-related code simpler and clearer (re #633481).Vitaly Minko2010-11-121-32/+6
* Make AccountChooser filters asynchronous to let them handle newly connected a...Vitaly Minko2010-11-111-25/+78
* about-dialog: add my emailGuillaume Desmottes2010-11-091-1/+1
* Merge branch 'subscription-msg-630707'Guillaume Desmottes2010-11-091-1/+2
|\
| * pass message to empathy_subscription_dialog_showGuillaume Desmottes2010-11-091-1/+2
| * empathy_subscription_dialog_show: display user's message if any (#630707)Guillaume Desmottes2010-11-091-1/+1
* | init GTK+ before empathy-gtkGuillaume Desmottes2010-11-091-0/+1
|/
* Add Accept/Decline button in subscription notifications (#630706)Guillaume Desmottes2010-11-091-0/+54
* add empathy_event_remove()Guillaume Desmottes2010-11-092-2/+9
* Always set up the call factory in empathy-av.Travis Reitter2010-11-041-3/+6
* Merge branch 'av-crash-633816'Guillaume Desmottes2010-11-031-3/+4
|\
| * Don't destroy the call factory right away (#633816)Guillaume Desmottes2010-11-021-3/+4
* | fix syntax errorGuillaume Desmottes2010-11-031-2/+3
* | Reword subscription request dialog to be less technicalAlex Launi2010-11-031-2/+2
|/
* empathy: use the proper exit statusTravis Reitter2010-10-301-2/+4
* empathy-debugger: use the proper exit statusTravis Reitter2010-10-301-2/+4
* empathy-chat: use the proper exit statusTravis Reitter2010-10-301-2/+3
* empathy-av: use the proper exit statusTravis Reitter2010-10-301-2/+3
* empathy-accounts: use the proper exit statusTravis Reitter2010-10-301-2/+3
* Make the chat program not exit after 60 seconds.Travis Reitter2010-10-301-42/+17
* Make the core empathy a command-line GApplication.Travis Reitter2010-10-301-46/+88
* Make empathy-accounts use act as a "command-line" GApplicationTravis Reitter2010-10-301-21/+60
* Relocate static function to eliminate prototype.Travis Reitter2010-10-301-21/+15
* Don't try to register for unique bus names in remote instances of empathy-av.Travis Reitter2010-10-301-15/+16
* Properly handle remote instances of empathy-av.Travis Reitter2010-10-301-43/+20
* Properly handle remote instances of the accounts dialog.Travis Reitter2010-10-301-3/+4
* Properly handle remote instances of the debugger.Travis Reitter2010-10-301-7/+21
* Don't try to register for unique bus names in remote instances of Empathy.Travis Reitter2010-10-301-45/+56
* Cut out unnecessary empathy_app_new().Travis Reitter2010-10-301-27/+3
* Make the Empathy core program act as a unique app.Travis Reitter2010-10-301-2/+2
* chat-manager: keep a ref on the chatroom mgrGuillaume Desmottes2010-10-281-12/+19
* empathy-account: change Salut -> People NearbyFrancisca Gallardo2010-10-261-1/+1
* src/Makefile.am: add $(NULL)Guillaume Desmottes2010-10-251-3/+6
* coding style fixGuillaume Desmottes2010-10-251-8/+11
* empathy.c: stop instantiating the chat managerGuillaume Desmottes2010-10-251-6/+0
* Create 'empathy-chat' handling text channels (#631946)Guillaume Desmottes2010-10-253-1/+184
* chat-manager: add API to track the number of handled chatsGuillaume Desmottes2010-10-252-0/+63
* chat-manager: make clear that we are dealing with *closed* chatsGuillaume Desmottes2010-10-253-22/+23
* rename the chat handler to Empathy.ChatGuillaume Desmottes2010-10-251-1/+1
* Merge remote branch 'vminko/fix-625780'Guillaume Desmottes2010-10-221-15/+15
|\
| * Return existing default chat window when it's hidden, just restore it in this...Vitaly Minko2010-10-211-15/+15
* | empathy.c: call g_application_hold() on the appGuillaume Desmottes2010-10-221-0/+1
* | GApplication is not a initable anymoreGuillaume Desmottes2010-10-221-6/+2
* | Port the a/v app to new G/tkApplication.Travis Reitter2010-10-221-22/+19
* | Port the accounts dialog to new G/tkApplication.Travis Reitter2010-10-221-5/+7
* | Port the debugger to new G/tkApplication.Travis Reitter2010-10-221-2/+5
* | Port core Empathy to new G/tkApplication.Travis Reitter2010-10-221-5/+4
|/
* Ensure that the connection of the account passed to EmpathyTpChat has capabil...Guillaume Desmottes2010-10-202-2/+10
* Port to libnotify 0.7.0William Jon McCann2010-10-192-3/+3
* move the 'Find in contact list' menu itemGuillaume Desmottes2010-10-181-1/+1
* Merge remote branch 'vminko/fix-632024-v2'Guillaume Desmottes2010-10-182-0/+17
|\
| * Move the 'Find in Contact List' item from the View menu to the Edit menu.Vitaly Minko2010-10-182-9/+9
| * Add an entry in the View menu to search for contacts (#632024).Vitaly Minko2010-10-182-0/+17
* | empathy-av: use GtkApplication (#621339)Guillaume Desmottes2010-10-181-1/+7
* | empathy-debugger: use GtkApplication (#621339)Guillaume Desmottes2010-10-181-2/+7
* | define EMPATHY_DBUS_NAMEGuillaume Desmottes2010-10-181-1/+3
* | stop linking on libuniqueGuillaume Desmottes2010-10-181-4/+0
* | empathy-accounts-common: no need to include uniqueGuillaume Desmottes2010-10-181-1/+0
* | empathy-accounts: port to GtkApplication (#621339)Guillaume Desmottes2010-10-181-41/+12
* | Use GtkApplication::activated instead of libuniqueGuillaume Desmottes2010-10-181-54/+21
* | EmpathyApp: inherit from GtkApplication (#621339)Guillaume Desmottes2010-10-181-7/+28
* | Create a EmpathyApp objectGuillaume Desmottes2010-10-181-147/+271
* | Port empathy-debug-window to GtkComboBoxTextDanielle Madeley2010-10-181-2/+2
* | Port empathy-account-assistant to GtkComboBoxTextDanielle Madeley2010-10-181-2/+2
* | Retain the ContactManager for the lifetime of the main window.Travis Reitter2010-10-161-5/+9
|/
* Separate spelling suggestions in one sub-menu per language (#532832)Vitaly Minko2010-10-151-21/+14
* A modal dialog to warn the user if account manager could not be contactedChandni Verma2010-10-151-0/+14
* enable imported Pidgin accounts if needed (#594145)Vitaly Minko2010-10-114-5/+62
* main-window: elipsize "No match found" messageGuillaume Desmottes2010-10-061-0/+3
* chat-window: port to new GtkNotebook APIGuillaume Desmottes2010-10-041-4/+7
* call-window: remove GTK2 compat codeGuillaume Desmottes2010-10-041-9/+0
* remove has-separator property from XML filesGuillaume Desmottes2010-10-042-2/+0
* don't set has-window on the spinnerGuillaume Desmottes2010-10-041-1/+0
* Import latest version of ev-sidebar from totemGuillaume Desmottes2010-10-046-708/+434
* about-dialog: gtk_about_dialog_set_url_hook has been removedGuillaume Desmottes2010-10-041-14/+0
* GDK keys are now GDK_KEY_*Guillaume Desmottes2010-10-047-13/+13
* Stop using GtkObject (#630685)Matthias Clasen2010-10-041-5/+3
* accounts-dialog: stop displaying the import dialog automatically (#631080)Guillaume Desmottes2010-10-011-19/+0
* Allow to set the Service of newly created account (#629734)Guillaume Desmottes2010-09-291-1/+1
* factor out empathy_protocol_chooser_create_account_settings()Guillaume Desmottes2010-09-292-114/+7
* Add empathy_service_name_to_display_name()Guillaume Desmottes2010-09-292-19/+11
* protocol-chooser: expose a 'service' string instead of boolean for facebook a...Guillaume Desmottes2010-09-292-20/+38
* Avoid to completely hide the last saved window when creating a new oneGuillaume Desmottes2010-09-291-0/+10
* chat-window: remember the geometry of the last saved windowGuillaume Desmottes2010-09-291-3/+10
* chat-window: most of the functions can be staticGuillaume Desmottes2010-09-292-53/+51
* google-talk: no need to unset the 'server' paramGuillaume Desmottes2010-09-282-2/+0
* Don't use deprecated gtk_dialog_set_has_separatorDiego Escalante Urrelo2010-09-283-15/+0
* Disable the fullscreen action while we are not connectedGuillaume Desmottes2010-09-271-0/+6
* empathy_call_window_fullscreen_set_cursor_visible: clean up functionGuillaume Desmottes2010-09-271-5/+5
* Leave fullscreen mode when call is disconnected (#593437)Guillaume Desmottes2010-09-271-0/+3
* show_borders: check if video_output still exists before using itGuillaume Desmottes2010-09-271-4/+9
* empathy_call_window_fullscreen_set_cursor_visible: early return if video widg...Guillaume Desmottes2010-09-271-1/+4
* call-window-fullscreen: NULLify the video widget when it's destroyedGuillaume Desmottes2010-09-271-0/+12
* disconnect signal before destroying the video widgetGuillaume Desmottes2010-09-271-0/+1
* factor out disconnect_video_output_motion_handler()Guillaume Desmottes2010-09-271-9/+12
* call-window: remove the errors info bar when redialing (#630276)Guillaume Desmottes2010-09-271-0/+4
* chat_window_new_message_cb: update the window icon as well (#558802)Guillaume Desmottes2010-09-271-1/+2
* empathy-accounts.c: check return value of unique_app_send_message (#629782)Guillaume Desmottes2010-09-271-4/+6
* empathy.c: check return value of unique_app_send_message (#629782)Guillaume Desmottes2010-09-271-4/+6
* switched notebook pagesFelix Kaser2010-09-132-11/+11
* Enable server fallback for GTalk accountNicolas Dufresne2010-09-092-8/+20
* Don't use gtk_progress_bar_set_orientation() when building with GTK+ 3Philip Withnall2010-09-071-0/+10
* Remove calls to gtk_dialog_set_has_separator() if building against GTK+ 3Philip Withnall2010-09-073-0/+11
* chat_window_detach_hook: move the window *after* showing itGuillaume Desmottes2010-08-301-1/+1
* Bug 628064 — Miscellaneous string fixesPhilip Withnall2010-08-271-1/+1
* Unmark strings as translatable which aren't shown to the userPhilip Withnall2010-08-271-3/+3
* new-chatroom-dialog: remove markup from transltable stringGuillaume Desmottes2010-08-271-2/+5
* accounts-dialog.ui: set pango properties in the UI file (#628063)Guillaume Desmottes2010-08-271-2/+5
* Merge branch 'trivia'Guillaume Desmottes2010-08-271-7/+14
|\
| * main-window: define an enum for pagesGuillaume Desmottes2010-08-271-3/+7
| * Increase the size of the 'No Match Found' labelGuillaume Desmottes2010-08-271-2/+7
| * no need to use a #defineGuillaume Desmottes2010-08-271-4/+2
* | Add an EmpathyIndividualView feature for receiving Persona dropsPhilip Withnall2010-08-271-1/+4
|/
* unsensitive the remove button while loadingGuillaume Desmottes2010-08-261-1/+14
* insensitive treeview while loadingGuillaume Desmottes2010-08-261-1/+4
* accounts-dialog: display loading page while loading accounts (#611701)Guillaume Desmottes2010-08-262-1/+55
* accounts-dialog: add a GtkNotebookGuillaume Desmottes2010-08-261-64/+102
* Merge branch 'irc-wizard-596086'Guillaume Desmottes2010-08-261-2/+1
|\
| * account-assistant: stop blacklisting IRC (#596086)Guillaume Desmottes2010-08-261-2/+1
* | accounts-dialog: insensitive 'add' and 'import' buttons while loading (#624353)Guillaume Desmottes2010-08-261-2/+18
|/
* added some files to gitignoreFelix Kaser2010-08-251-0/+1
* allow building empathy without edsSaleem Abdulrasool2010-08-252-2/+11
* Merge branch 'tls-connection'Cosimo Cecchi2010-08-244-4/+285
|\
| * Don't show the error if user-requested is setCosimo Cecchi2010-08-191-1/+10
| * Use new API in EmpathyAccountsDialogCosimo Cecchi2010-08-191-2/+2
| * Fill 'user-requested' when we reject the certificateCosimo Cecchi2010-08-191-3/+11
| * Implement a timeout machinery for the auth clientCosimo Cecchi2010-08-191-1/+63
| * Rename empathy-auth-helper->empathy-auth-clientCosimo Cecchi2010-08-192-6/+6
| * Push the details table to the dialog after verificationCosimo Cecchi2010-08-191-4/+6
| * Update to the new EmpathyTLSCertificate async APICosimo Cecchi2010-08-191-3/+4
| * Save the certificate when we are told to rememberCosimo Cecchi2010-08-131-0/+5
| * Integrate the dialog into the auth helperCosimo Cecchi2010-08-131-1/+41
| * Verify the certificate from the helper.Cosimo Cecchi2010-08-131-4/+52
| * Add EmpathyTLSVerifierCosimo Cecchi2010-08-131-0/+9
| * Add a first skeleton of the auth helper.Cosimo Cecchi2010-08-132-1/+98
* | pass NULL instead of "" to gtk_label_new()Guillaume Desmottes2010-08-232-2/+2
* | Display invite dialog even if we don't know the inviter (#627228)Guillaume Desmottes2010-08-181-7/+14
* | display_invite_room_dialog: deal with contact being NULLGuillaume Desmottes2010-08-181-3/+11
* | factor out display_invite_room_dialogGuillaume Desmottes2010-08-181-15/+22
* | event-manager: use tp_user_action_time_from_x11()Guillaume Desmottes2010-08-181-7/+4
* | empathy_chat_window_present_chat: use tp_user_action_time_should_presentGuillaume Desmottes2010-08-181-5/+2
* | use TP_USER_ACTION_TIME_* (#627165)Guillaume Desmottes2010-08-184-10/+10
* | add preference to disable logging (#567858)Guillaume Desmottes2010-08-172-0/+25
|/
* event-manager: we don't use the dispatcher any moreGuillaume Desmottes2010-08-131-4/+0
* tp-call: add account propertyGuillaume Desmottes2010-08-121-1/+1
* tp-chat: add 'account' propertyGuillaume Desmottes2010-08-122-2/+2
* remove empathy-dispatch-operationGuillaume Desmottes2010-08-111-1/+0
* empathy_dispatcher_join_muc: get an account instead of a connectionGuillaume Desmottes2010-08-114-65/+17
* empathy_dispatcher_chat_with_contact_id: get a TpAccount instead of a TpConne...Guillaume Desmottes2010-08-112-9/+7
* empathy_dispatcher_chat_with_contact_id: remove callback argumentGuillaume Desmottes2010-08-112-2/+2
* Don't abort when closing the FT dialoguePhilip Withnall2010-08-111-0/+4
* Use TpSimpleHandler to handle incoming file transfer (#623139)Guillaume Desmottes2010-08-111-0/+6
* tp-file: no need to pass the incoming property during constructionGuillaume Desmottes2010-08-111-1/+1
* stop handling internally FT channelsGuillaume Desmottes2010-08-111-62/+3
* empathy_contact_selector_dialog_get_selected: allow to get the account as wellGuillaume Desmottes2010-08-101-1/+1
* only show label during searchFelix Kaser2010-08-091-13/+7
* use gtk_clutter_init rather than clutter_initGuillaume Desmottes2010-08-091-3/+5
* Remove uses of new GStreamer APIPhilip Withnall2010-08-061-6/+0
* Add casts to fix constness problems in empathy-import-pidgin.cPhilip Withnall2010-08-061-5/+5
* Add noreturn annotation to version callback functionPhilip Withnall2010-08-051-2/+5
* Fix constness of various variables and parametersPhilip Withnall2010-08-053-7/+7
* Fix missing entries in switch statementsPhilip Withnall2010-08-054-9/+39
* Use #ifdef instead of #if to avoid warnings of undefined symbolsPhilip Withnall2010-08-053-8/+8
* use different labels if view is emptyFelix Kaser2010-08-052-19/+28
* show label if contact list is emptyFelix Kaser2010-08-051-4/+48
* added structure to show text when list emptyFelix Kaser2010-08-052-5/+35
* no need to pass the reason to main_window_error_displayGuillaume Desmottes2010-08-051-3/+2
* no need to pass the reason to empathy_account_get_error_messageGuillaume Desmottes2010-08-052-3/+3
* accounts-dialog: use empathy_account_get_error_message (#523895)Guillaume Desmottes2010-08-051-2/+2
* main-window: use empathy_account_get_error_message (#523895)Guillaume Desmottes2010-08-051-4/+1
* main-window: pass the TpConnectionStatusReason to main_window_error_displayGuillaume Desmottes2010-08-051-6/+5
* display the tooltip on the info imageGuillaume Desmottes2010-08-051-7/+17
* add 'info' icon next to the candidatesGuillaume Desmottes2010-08-051-16/+80
* call-window: use candidates-changed signalGuillaume Desmottes2010-08-051-79/+37
* use a space to separate the IP from the portGuillaume Desmottes2010-08-051-1/+1
* add tooltips giving a bit more context about the candidateGuillaume Desmottes2010-08-051-0/+23
* call-window: display candidates info (#599166)Guillaume Desmottes2010-08-052-0/+370
* removed fixme comment when toggling show_offlineFelix Kaser2010-08-031-3/+0
* refactored show_offline property to the viewFelix Kaser2010-08-031-1/+1
* Add a translator comment explaining the "reduce location" semantic (#624062)Guillaume Desmottes2010-08-031-1/+1
* map-view: be a proper GtkWindow (#625826)Guillaume Desmottes2010-08-023-154/+221
* free the list returned by clutter_container_get_children()Guillaume Desmottes2010-08-021-3/+4
* Merge EmpathyContact:name and *_set_alias() to EmpathyContact:aliasPhilip Withnall2010-07-225-21/+21
* Merge remote branch 'pwith/folks-integ-rebase1-fixes-rebase1' into folks-fixesTravis Reitter2010-07-221-0/+2
* Add authors and fix copyrights for empathy-accounts-moduleDanielle Madeley2010-07-213-3/+7
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 00:55:46 +0800