aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
Commit message (Expand)AuthorAgeFilesLines
* Hide state image in contact widget until the presense state is notified. (#60...Brian Pepple2009-12-022-1/+1
* chat: don't display latest logs in roomGuillaume Desmottes2009-12-021-1/+3
* added destroyed flagFelix Kaser2009-12-021-1/+20
* fixed problem with destroyed widget in async callFelix Kaser2009-12-021-0/+5
* update presence when account is enabledFelix Kaser2009-12-021-10/+39
* emit account-created signal outside enabled_cbFelix Kaser2009-12-021-9/+4
* Link libempathy-gtk against libnotifyLaurent Bigonville2009-12-011-0/+2
* Use \s to match spaces, it is the same as [ \t\n\r\f\v]Xavier Claessens2009-12-011-1/+1
* Merge commit 'shaunm/dndfiles2'Guillaume Desmottes2009-11-304-77/+266
|\
| * [empathy-contact-list-view] Don't accept file drags to offline/non-FT contactsShaun McCance2009-11-251-1/+3
| * Move GtkTargetLists into priv so they're no longer staticShaun McCance2009-11-251-7/+9
| * Fixed leak in drag motion and added comments for bug #595226Shaun McCance2009-11-251-1/+15
| * Utilitiy function to send files from a URI list, for dnd implementationsShaun McCance2009-11-254-18/+39
| * Split contact_list_view_drag_data_received into smaller functionsShaun McCance2009-11-251-118/+141
| * Setting reorderable on the contact list view to get row previews as drag iconsShaun McCance2009-11-251-1/+6
| * Allow contacts to be dragged anywhere in a group, or dragged to the non-groupShaun McCance2009-11-251-5/+20
| * Implemented file drags to contact list, along with row highlightsShaun McCance2009-11-251-79/+173
| * Implementing drag and drop file sending on chat windowsShaun McCance2009-11-253-13/+26
* | empathy-chat: keep count of the number of unread messagesGuillaume Desmottes2009-11-272-0/+26
* | chat-text-view: override GtkTextView copy_clipboardGuillaume Desmottes2009-11-261-0/+11
* | gssize isn't an int on various platformsSjoerd Simons2009-11-261-1/+1
* | Merge branch 'adium-events'Xavier Claessens2009-11-261-20/+28
|\ \
| * | Do not escape twice /me messages with adium theme.Xavier Claessens2009-11-251-20/+27
| |/
* | Clean how we insert smileys in adium themesXavier Claessens2009-11-261-13/+5
* | Clean how we insert link in adium themesXavier Claessens2009-11-261-8/+6
* | Rework the link regex to have "(user@server.com)" case work.Xavier Claessens2009-11-251-7/+9
* | Escape what is put inside <a> tagsGustavo Noronha Silva2009-11-251-1/+8
* | Add more test cases and fix some found issues in link regex.Xavier Claessens2009-11-251-1/+1
* | Replace GString param with a generic gpointer user_data, and port EmpathyChat...Xavier Claessens2009-11-254-164/+163
* | Make possible to define different replace function for parsersXavier Claessens2009-11-253-84/+133
* | Accept any foo:// URL SchemesXavier Claessens2009-11-251-4/+4
* | start and end positions in EmpathySmileyHit struct can't be negative. Change ...Xavier Claessens2009-11-253-4/+4
* | Add comments to explain empathy_smiley_manager_parse_len(), it is non-trivial...Xavier Claessens2009-11-252-4/+34
* | Optimisation: Do not fetch use-smiley gconf key for each substring.Xavier Claessens2009-11-251-6/+7
* | Extract empathy_string_parser_link and empathy_string_parser_escape from empa...Xavier Claessens2009-11-253-64/+76
* | Create API for generic string parserXavier Claessens2009-11-253-13/+54
* | Remove dead code from EmpathySmileyManagerXavier Claessens2009-11-252-95/+10
* | Use new smiley parser in EmpathyChatTextView.Xavier Claessens2009-11-252-13/+20
* | exclude " and ' from links.Xavier Claessens2009-11-251-2/+2
* | Rework the way message parsing and escaping is done.Xavier Claessens2009-11-251-90/+126
* | Introduce a new smiley parser that can parse only a part of a string.Xavier Claessens2009-11-252-0/+94
|/
* Make sure double quotes are not considered part of URIsGustavo Noronha Silva2009-11-251-2/+2
* Clarify macro namesXavier Claessens2009-11-241-15/+21
* Create EMPATHY_RECT_IS_ON_SCREEN macro instead of duplicating its code.Xavier Claessens2009-11-243-6/+8
* Restore position of window if it gets remapped.Xavier Claessens2009-11-241-14/+51
* Make empathy_present_window() also move to current desktop with compiz. Fixes...Xavier Claessens2009-11-241-3/+15
* Make sure to not save offscreen positioning. It happens with compiz.Xavier Claessens2009-11-241-0/+6
* account-widget-sip: translate all the labels in combo boxGuillaume Desmottes2009-11-231-5/+9
* empathy-account-widget-private: fix coding styleGuillaume Desmottes2009-11-231-3/+3
* rename account_widget_setup_widget empathy_account_widget_setup_widgetGuillaume Desmottes2009-11-233-6/+7
* fix position of the 2 combo boxesGuillaume Desmottes2009-11-231-2/+2
* move port settings to the same line as the hostGuillaume Desmottes2009-11-231-105/+106
* indent the STUN Server/Port label under the checkboxGuillaume Desmottes2009-11-231-2/+2
* rephrase subsection titles and their labelsGuillaume Desmottes2009-11-231-8/+8
* add indentation so subsections are clearerGuillaume Desmottes2009-11-231-130/+194
* rephrase the discover-stun checkbox labelGuillaume Desmottes2009-11-231-1/+1
* rename Misc section to MiscellaneousGuillaume Desmottes2009-11-231-1/+1
* account-widget-sip: add subsections in the advanced sectionGuillaume Desmottes2009-11-232-37/+90
* account-widget-sip: fix typo in variable nameGuillaume Desmottes2009-11-231-3/+3
* account-widget-sip: unsensitive the STUN labels as well when STUN is disabledGuillaume Desmottes2009-11-231-0/+6
* account_widget_combobox_changed_cb: check that param has a defaultGuillaume Desmottes2009-11-231-2/+3
* Set explicitely the model of combo boxGuillaume Desmottes2009-11-232-25/+69
* unsensitive the keep-alive spin button if keep-alive is disabledGuillaume Desmottes2009-11-231-0/+22
* account-widget-sip: add UI to configure the keepalive-mechanism and keepalive...Guillaume Desmottes2009-11-232-1/+67
* account-widget-sip: add UI to configure the discover-binding paramGuillaume Desmottes2009-11-232-1/+17
* account-widget-sip: add UI to configure the loose-routine paramGuillaume Desmottes2009-11-232-1/+17
* account-widget-sip: add UI to configure the transport paramGuillaume Desmottes2009-11-232-1/+39
* account_widget_setup_widget: add support for GtkComboBoxGuillaume Desmottes2009-11-231-0/+64
* empathy-account-widget: export account_widget_setup_widgetGuillaume Desmottes2009-11-232-1/+5
* account-widget-sip: Add UI to configure auth-user, proxy-host and port params...Guillaume Desmottes2009-11-232-1/+87
* notify-manager: unref the account mgr when disposingGuillaume Desmottes2009-11-191-0/+15
* account-widget: use the account-manaer instead of idleGuillaume Desmottes2009-11-191-32/+56
* notify-manager: use the account mgr directly instead of empathy_check_availab...Guillaume Desmottes2009-11-191-1/+39
* presence-chooser: use the account-manager directly to get our state and statusGuillaume Desmottes2009-11-191-17/+48
* don't mix code and variable declarationsGuillaume Desmottes2009-11-191-4/+4
* Fixed some of Gillaume's review comments from Bug #571642Jonathon Jongsma2009-11-191-44/+38
* Handle the case where a user's id changes in a chatroomJonathon Jongsma2009-11-192-0/+85
* presence-chooser: remove icon blinking supportGuillaume Desmottes2009-11-181-88/+4
* account-widget-jabber: increase spacing in the 'Override Server Settings' sec...Guillaume Desmottes2009-11-171-0/+2
* Use accessor functions instead direct access.Javier Jardón2009-11-1710-22/+33
* geometry: port to TP coding styleGuillaume Desmottes2009-11-162-152/+156
* Correctly store/restore maximized state of windows.Xavier Claessens2009-11-162-115/+173
* log-window: check if the account chooser isn't already readyGuillaume Desmottes2009-11-161-3/+7
* add empathy_account_chooser_is_readyGuillaume Desmottes2009-11-162-0/+11
* log-window: wait that the accounts chooser is ready before selecting the chatGuillaume Desmottes2009-11-161-4/+21
* account-chooser.c: add a 'ready' signalGuillaume Desmottes2009-11-161-0/+19
* Implement /nick commandXavier Claessens2009-11-141-0/+23
* account_widget_build_salut: focus the first name entry by defaultGuillaume Desmottes2009-11-141-1/+1
* Respect indentation style.Cosimo Cecchi2009-11-131-14/+14
* empathy-chat: watch for password-needed property changesGuillaume Desmottes2009-11-131-4/+16
* ask for password when joining a protected room (#579341)Guillaume Desmottes2009-11-131-0/+152
* empathy-chat: don't grab focus on the input entry is it's insensitiveGuillaume Desmottes2009-11-131-1/+3
* chat-ui: add info_bar_vbox on the top of the widgetGuillaume Desmottes2009-11-131-2/+11
* change 'capa' to 'cap'Guillaume Desmottes2009-11-132-23/+23
* empathy_notify_manager_init: no need to cast the return value of g_object_newGuillaume Desmottes2009-11-131-2/+1
* remove notify_manager_dispose as it doesn't do anythingGuillaume Desmottes2009-11-131-16/+0
* notify-manager: fetch capabilities in _init instead of _constructorGuillaume Desmottes2009-11-131-16/+13
* change empathy_notification_is_enabled to empathy_notify_manager_notification...Guillaume Desmottes2009-11-132-2/+3
* change empathy_misc_get_pixbuf_for_notification to empathy_notify_manager_get...Guillaume Desmottes2009-11-132-3/+6
* move empathy-misc to empathy-notify-managerGuillaume Desmottes2009-11-132-0/+58
* define constants for notify capabilitiesGuillaume Desmottes2009-11-131-0/+19
* add empathy_notify_manager_has_capabilityGuillaume Desmottes2009-11-132-0/+12
* notify-manager: fetch capabilities of the notification serverGuillaume Desmottes2009-11-131-1/+23
* add stub EmpathyNotifyManager (#601691)Guillaume Desmottes2009-11-133-0/+170
* libempathy-gtk/Makefile.am: sort filesGuillaume Desmottes2009-11-131-19/+19
* empathy_account_widget_get_default_display_name: special case should be done ...Guillaume Desmottes2009-11-131-0/+1
* move code generating the default display name of new account to account-widgetGuillaume Desmottes2009-11-132-0/+55
* Make location labels selectablePierre-Luc Beaudoin2009-11-121-0/+3
* Add missing location field in orderingPierre-Luc Beaudoin2009-11-121-0/+6
* Order location fieldsFrederic Peters2009-11-121-7/+21
* Force an unset presence type to appear as offline in the presence chooser and...Jonny Lamb2009-11-121-0/+6
* account-widget: Change the label of the Connect button to 'Login'.Guillaume Desmottes2009-11-061-14/+9
* contact-menu: rename "View Previous Conversations" menu entry to "Previous Co...Guillaume Desmottes2009-11-051-1/+1
* Print "Unknown command" when typing "/help unknown"Xavier Claessens2009-11-041-0/+3
* Make parsing of commend with no args work againXavier Claessens2009-11-041-2/+6
* Merge branch 'irc-command'Xavier Claessens2009-11-041-15/+363
|\
| * Optimisation: Remove of the duplicated check for the command prefix.Xavier Claessens2009-11-041-6/+2
| * Make clear that for(foo); does nothing.Xavier Claessens2009-11-041-1/+2
| * In case of unknown command, suggest /helpXavier Claessens2009-11-011-1/+2
| * Move /me and /say support from EmpathyMessage to EmpathyChat.Xavier Claessens2009-11-011-14/+69
| * Add support for /help command without arg, to list all available commands.Xavier Claessens2009-11-011-39/+47
| * Add support for /help command and fix review commentsXavier Claessens2009-11-011-91/+165
| * Refactor chat commands.Xavier Claessens2009-11-011-85/+127
| * Add support for /msg commandXavier Claessens2009-11-011-2/+74
| * Add support for /query commandXavier Claessens2009-11-011-0/+28
| * Add support for /join commandXavier Claessens2009-11-011-2/+30
| * Fix topic not always shown, and add /topic command support.Xavier Claessens2009-11-011-4/+47
* | empathy_account_widget_contains_pending_changes: return TRUE if we are creati...Guillaume Desmottes2009-11-031-0/+10
* | Merge branch 'fix-586098'Danielle Madeley2009-11-031-50/+251
|\ \
| * | empathy-chat.c: input history - Using GList pointer instead of gint index.Jerzy Mansarliński2009-11-011-83/+109
| * | Fix coding styleJerzy Mansarliński2009-10-301-36/+37
| * | Add terminal-like chat input history. Fixes bug #586098.Jerzy Mansarliński2009-10-301-37/+211
| |/
* | empathy-account-widget: update apply button when our state changesGuillaume Desmottes2009-11-031-0/+23
* | empathy-account-widget: replace the 'Connect' buton by a 'Save' one ...Guillaume Desmottes2009-11-031-2/+36
* | Autocomplete for offline contacts. Closes bug #583919.Justin Forest2009-11-031-17/+15
* | account-chooser: allow for a non-prepared account manager (fixes bug #600537)Jonny Lamb2009-11-031-0/+8
* | Merge branch 'accountz'Jonny Lamb2009-11-0217-197/+375
|\ \ | |/ |/|
| * contact-list-view: added note about waiting for manager to be come ready bugJonny Lamb2009-10-301-1/+1
| * location-manager: keep a ref to self during preparation to make sure we stay ...Jonny Lamb2009-10-301-1/+2
| * all: log error messages if preparing the account manager failsJonny Lamb2009-10-305-8/+33
| * ui-utils: port to new tp-glib account APIJonny Lamb2009-10-241-1/+0
| * theme-adium: port to new tp-glib account APIJonny Lamb2009-10-241-3/+3
| * presence-chooser: port to new tp-glib account APIJonny Lamb2009-10-241-14/+42
| * new-message-dialog: port to new tp-glib account APIJonny Lamb2009-10-241-1/+0
| * log-window: port to new tp-glib account APIJonny Lamb2009-10-242-30/+50
| * location-manager: port to new tp-glib account APIJonny Lamb2009-10-241-16/+77
| * irc-network-dialog: port to new tp-glib account APIJonny Lamb2009-10-241-1/+0
| * contact-widget: port to new tp-glib account APIJonny Lamb2009-10-241-3/+3
| * contact-list-view: port to new tp-glib account APIJonny Lamb2009-10-241-8/+10
| * contact-dialogs: port to new tp-glib account APIJonny Lamb2009-10-241-3/+4
| * chat-text-view: port to new tp-glib account APIJonny Lamb2009-10-241-1/+0
| * chat: port to new tp-glib account APIJonny Lamb2009-10-242-23/+44
| * account-widget: port to new tp-glib account APIJonny Lamb2009-10-241-14/+14
| * account-chooser: port to new tp-glib account APIJonny Lamb2009-10-242-79/+102
* | Add new smileys available in the last Icon Naming Spec (#593327)Rodolphe2009-10-271-5/+11
* | theme_adium_parse_body: escape text between linksGuillaume Desmottes2009-10-261-2/+8
* | theme_adium_parse_body: escape all the text if smileys are disabled (#599640)Guillaume Desmottes2009-10-261-0/+2
* | theme_adium_append_event: escape textXavier Claessens2009-10-261-2/+6
|/
* Set default font from Gnome system if not set in the style.Matěj Cepl2009-10-231-9/+73
* Enable extra error CFLAGS in libempathy-gtk/Guillaume Desmottes2009-10-231-0/+1
* empathy-protocol-chooser: don't cache TpConnectionManagerProtocol in the storeGuillaume Desmottes2009-10-231-28/+47
* Merge branch 'trivia'Guillaume Desmottes2009-10-2211-62/+65
|\
| * empathy-avatar-chooser.c: fix identationGuillaume Desmottes2009-10-221-2/+2
| * totem-subtitle-encoding.c: fix shadow declarationsGuillaume Desmottes2009-10-221-13/+13
| * empathy-ui-utils.c: fix shadow declarationGuillaume Desmottes2009-10-221-4/+4
| * empathy-theme-manager.c: fix shadow declarationsGuillaume Desmottes2009-10-221-4/+4
| * empathy-theme-boxes.c: fix shadow declarationsGuillaume Desmottes2009-10-221-3/+3
| * empathy-theme-adium.c: fix uint comparaisonsGuillaume Desmottes2009-10-221-2/+2
| * empathy-status-preset-dialog: fix uint comparaisonsGuillaume Desmottes2009-10-221-2/+2
| * empathy-contact-widget.c: fix shadow declarationsGuillaume Desmottes2009-10-221-11/+11
| * empathy-chat-text-view.c: fix shadow declarations and uint comparaisonsGuillaume Desmottes2009-10-221-5/+5
| * empathy-avatar-image.c: fix a casting issueGuillaume Desmottes2009-10-221-1/+2
| * empathy-avatar-chooser.c: fix casting issuesGuillaume Desmottes2009-10-221-16/+18
| * empathy-account-widget.c: fix uint comparaisonGuillaume Desmottes2009-10-221-1/+1
* | fix a comment so the style checker is happy (#599243)Guillaume Desmottes2009-10-221-1/+1
|/
* empathy-location-manager.c: fix shadow declarationsGuillaume Desmottes2009-10-211-45/+45
* empathy-contact-list-view.c: fix shadow declarations and uint comparaisonsGuillaume Desmottes2009-10-211-6/+6
* empathy-contact-list-store.c: fix shadow declarationsGuillaume Desmottes2009-10-211-4/+3
* Ignoring non installed languagesFelix Kaser2009-10-211-1/+6
* Stop building libempathy{,-gtk} as a shared library. Closes bug #599086Jonny Lamb2009-10-212-43/+19
* Use the contacts alias in the information dialogSjoerd Simons2009-10-201-1/+2
* rename contact_list_store_finalize to contact_list_store_disposeGuillaume Desmottes2009-10-191-4/+9
* empathy-contact-list-store: remove the setup idle cb when store is destroyedGuillaume Desmottes2009-10-191-1/+7
* presence-chooser: remove "\n"s from DEBUG callsJonny Lamb2009-10-161-5/+5
* presence-chooser: make the entry not editable when we are offlineJonny Lamb2009-10-161-0/+5
* Don't try to double free the avatar data (#598423).Cosimo Cecchi2009-10-151-31/+11
* Use a nicer callback nameSjoerd Simons2009-10-151-5/+6
* Use empathy_signal_connect_weakSjoerd Simons2009-10-151-16/+10
* make the presence chooser insensitive no accounts are enabledSjoerd Simons2009-10-151-3/+58
* Fix typo, correctly set the description of the sound being played.Xavier Claessens2009-10-121-1/+1
* Refactor context menu code to use new HitTestResult APIGustavo Noronha Silva2009-10-101-125/+121
* Add missing ; to make it build.Xavier Claessens2009-10-091-1/+1
* Removed leak with g_string_free, added comment for 0xFFFCGabriel Millaire2009-10-061-1/+4
* Merge branch 'contact-info'Xavier Claessens2009-10-051-1/+1
|\
| * Fix the contact information dialog's window.Xavier Claessens2009-10-051-1/+1
* | Rename HAVE_NBTK to HAVE_MOBLIN.Xavier Claessens2009-10-051-15/+15
|/
* Remove the logic that re-applies the original enabled value.Cosimo Cecchi2009-10-031-17/+4
* empathy-account-widget: document that the 'Account:' string is moblin specificGuillaume Desmottes2009-10-031-0/+1
* Rename the Connect button to "Log in" on Moblin.Cosimo Cecchi2009-10-031-0/+7
* Merge branch 'chain'Cosimo Cecchi2009-10-011-145/+3
|\
| * Chain up to the parent class render, instead of copying it.Cosimo Cecchi2009-10-011-145/+3
* | Merge commit 'gabriel/fix-581488'Dafydd Harries2009-10-013-1/+58
|\ \ | |/ |/|
| * Fixed a leak of strGabriel Millaire2009-10-011-2/+2
| * Fix after reviewGabriel Millaire2009-10-012-34/+33
| * Fix copy clipboard to show smileys and to show name and time when using theme...Gabriel Millaire2009-10-013-1/+59
* | Return if the renderer has no pixbuf.Cosimo Cecchi2009-10-011-0/+3
|/
* Even if Next*.html are missing, we have to use the appendNextMessage js funct...Xavier Claessens2009-09-301-5/+8
* Respect "DisableCombineConsecutive" adium theme setting. Fixes bug #596317Xavier Claessens2009-09-301-3/+6
* Make the correct fallbacks in case of missing html files in an Adium theme. F...Xavier Claessens2009-09-301-50/+51
* Add a "show-on-select" property.Cosimo Cecchi2009-09-302-60/+283
* Instant-apply the "enabled" setting.Cosimo Cecchi2009-09-281-9/+12
* Add configure switches for nbtk (off by default).Cosimo Cecchi2009-09-281-0/+2
* Add an optional NbtkGtkLightSwitch.Cosimo Cecchi2009-09-281-5/+70
* Merge branch 'contact-id'Xavier Claessens2009-09-231-1/+1
|\
| * Init contact_id to NULL to silent some stupid compilators. It can't really be...Xavier Claessens2009-09-231-1/+1
* | Cancel existing group animation before starting anotherWill Thompson2009-09-231-0/+7
|/
* Do not use math.h for trunc(). It is useless and it does not build because we...Xavier Claessens2009-09-221-6/+2
* Merge commit 'istaz/handle_none'Xavier Claessens2009-09-211-4/+3
|\
| * Fallback to the contact id if present when there is no room id for empathy_tp...Olivier Le Thanh Duong2009-09-211-4/+3
* | presence-chooser: only listen to EmpathyIdle::notify::stateJonny Lamb2009-09-181-1/+1
* | Don't paste if the remote contact is disconnected (#595417).Cosimo Cecchi2009-09-171-0/+7
|/
* Correctly split and sanity check dropped contactsSjoerd Simons2009-09-151-7/+9
* Don't use "/" to separate account and contact.Cosimo Cecchi2009-09-151-1/+1
* Fix previous patch.Steve Frécinaux2009-09-151-4/+4
* Ensure the Contact List is moved to the current workspace when shown.Steve Frécinaux2009-09-151-8/+6
* [EmpathyVideoWidget] fix X crash when using Empathy with GTK+ c-s-wDanielle Madeley2009-09-141-0/+13
* Ensure we don't add the same contact twice at the top-levelSjoerd Simons2009-09-141-0/+18
* remove duplicated id in yahoo account ui file (GNOME bug 594776)Frédéric Péters2009-09-111-1/+1
* Fix duplicate XML ids in GtkBuilder file that stopped it from loadingDavyd Madeley2009-09-011-3/+3
* [empathy_builder_get_file] NULL out passed GObj ptrs if GtkBuilder file brokenDavyd Madeley2009-09-011-1/+11
* Sort Gtalk after jabberSjoerd Simons2009-08-311-0/+11
* GTalk-enable the protocol chooserSjoerd Simons2009-08-312-7/+34
* Construct the GTalk widget according to the icon nameCosimo Cecchi2009-08-311-1/+28
* Add a specialized GTalk widget UI in gladeCosimo Cecchi2009-08-311-5/+114
* Always update the control buttons sensitivity on creation.Cosimo Cecchi2009-08-311-11/+7
* Fixed some of the EmpathyAccountWidget's control button behaviour.Jonathan Tellier2009-08-311-2/+16
* Merge commit 'jtellier/confirm-lose-accounts-settings'Cosimo Cecchi2009-08-312-21/+36
|\
| * Improved confirmation dialog shown to the user before discarding changesJonathan Tellier2009-08-292-34/+0
| * Minor changes to EmpathyAccountWidget and EmpathyAccountsDialogJonathan Tellier2009-08-291-16/+3
| * Asking for confirmation before losing pending accounts changes.Jonathan Tellier2009-08-294-5/+67
* | Use char* not EmpathyMessage in TpChat:send-errorWill Thompson2009-08-311-2/+2
|/
* Add empathy_make_absolute_url_len to limit the lenght of url stringPierre-Luc Beaudoin2009-08-293-13/+28
* Make the protocol property read-onlySjoerd Simons2009-08-281-9/+3
* Base the selected widget both on the CM and the protocolSjoerd Simons2009-08-282-39/+65
* Merge branch 'fix-navigation-handling'Gustavo Noronha Silva2009-08-281-9/+19
|\
| * Fix assumption about navigation-request not being called for HTML string loadGustavo Noronha Silva2009-08-281-9/+19
* | Remove validation from chat_send.Will Thompson2009-08-281-22/+8
* | /clearly shouldn't clear the window.Will Thompson2009-08-281-1/+1
* | Fall back to protocol name in Adium themesWill Thompson2009-08-281-0/+2
|/
* Merge commit 'jtellier/reconnect-account'Guillaume Desmottes2009-08-271-37/+26
|\