aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* port check-empathy-chatroom.c to GTestGuillaume Desmottes2009-11-035-16/+24
* port check-empathy-irc-network-manager.c to GTestGuillaume Desmottes2009-11-036-103/+120
* port check-empathy-irc-network.c to GTestGuillaume Desmottes2009-11-035-40/+50
* port check-empathy-irc-server.c to GTestGuillaume Desmottes2009-11-036-40/+48
* move test_init/test_deinit to test-helper.cGuillaume Desmottes2009-11-034-17/+31
* port check-empathy-utils.c to GTestGuillaume Desmottes2009-11-036-34/+72
* 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
* accounts-dialog: don't always select the first account automaticallyJonny Lamb2009-11-031-2/+7
* Remove LIBPANELAPPLET entry from configure.acDanielle Madeley2009-11-031-1/+0
* empathy-accounts-dialog: account-validity-changed signal now has a 'valid' ar...Guillaume Desmottes2009-11-031-0/+1
* Merge branch 'accountz'Jonny Lamb2009-11-0261-3462/+1308
|\
| * Upped dependency on tp-glibJonny Lamb2009-10-301-1/+1
| * contact-list-view: added note about waiting for manager to be come ready bugJonny Lamb2009-10-301-1/+1
| * empathy: when creating salut account, be sure to wait for the account managerJonny Lamb2009-10-301-14/+37
| * log-store-empathy: refer to "make logs async" bugJonny Lamb2009-10-301-1/+1
| * dispatcher: refer to EmpathyHandler bugJonny Lamb2009-10-301-1/+1
| * idle: added a comment to explain _is_just_connectedJonny Lamb2009-10-301-0/+3
| * idle: don't hardcode 10 seconds as the "just connected" timeJonny Lamb2009-10-301-1/+5
| * idle: add comment about the connect_times hash table typesJonny Lamb2009-10-301-0/+2
| * idle: updated commentJonny Lamb2009-10-301-2/+4
| * utils: remove FIXMEJonny Lamb2009-10-301-2/+0
| * 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-3015-30/+112
| * check-empathy-chatroom-manager: port to new tp-glib account APIJonny Lamb2009-10-251-1/+1
| * tests: port to new tp-glib account APIJonny Lamb2009-10-252-4/+5
| * po: removed empathy-account.c from POTFILES.inJonny Lamb2009-10-251-1/+0
| * contact-manager, dispatcher: renamed _new_connection_cb to _status_changed_cbJonny Lamb2009-10-252-6/+6
| * idle: use the TpAccount pointer as key to the hash table, and remove values o...Jonny Lamb2009-10-251-12/+8
| * empathy: port to new tp-glib account APIJonny Lamb2009-10-241-85/+76
| * status-icon: port to new tp-glib account APIJonny Lamb2009-10-241-21/+36
| * new-chatroom-dialog: port to new tp-glib account APIJonny Lamb2009-10-241-3/+3
| * main-window: port to new tp-glib account APIJonny Lamb2009-10-241-48/+87
| * import-widget: port to new tp-glib account APIJonny Lamb2009-10-241-27/+30
| * import-mc4-accounts: port to new tp-glib account APIJonny Lamb2009-10-241-5/+5
| * event-manager: port to new tp-glib account APIJonny Lamb2009-10-241-4/+11
| * chatrooms-window: port to new tp-glib account APIJonny Lamb2009-10-241-2/+2
| * chat-window: port to new tp-glib account APIJonny Lamb2009-10-242-14/+18
| * accounts-dialog: port to new tp-glib account APIJonny Lamb2009-10-242-145/+70
| * account-assistant: port to new tp-glib account APIJonny Lamb2009-10-241-3/+3
| * 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
| * tp-roomlist: port to new tp-glib account APIJonny Lamb2009-10-242-8/+6
| * log-store: port to new tp-glib account APIJonny Lamb2009-10-242-19/+19
| * log-store-empathy: port to new tp-glib account APIJonny Lamb2009-10-241-17/+19
| * log-manager: port to new tp-glib account APIJonny Lamb2009-10-242-11/+11
| * dispatcher: port to new tp-glib account APIJonny Lamb2009-10-241-27/+48
| * contact: port to new tp-glib account APIJonny Lamb2009-10-242-17/+13
| * contact-manager: port to new tp-glib account APIJonny Lamb2009-10-241-22/+46
| * chatroom: port to new tp-glib account APIJonny Lamb2009-10-242-13/+14
| * chatroom-manager: port to new tp-glib account APIJonny Lamb2009-10-242-41/+27
| * account-settings: port to new tp-glib account APIJonny Lamb2009-10-242-77/+77
| * Add empathy_idle_account_is_just_connected function.Jonny Lamb2009-10-242-0/+70
| * idle: port to new tp-glib account APIJonny Lamb2009-10-241-20/+22
| * Add empathy_account_manager_get_accounts_connected function.Jonny Lamb2009-10-242-0/+36
| * Add empathy_get_account_for_connection function.Jonny Lamb2009-10-242-1/+36
| * Add empathy_idle_get_requested_presence function.Jonny Lamb2009-10-242-12/+44
| * Removed EmpathyAccount{,Manager}.Jonny Lamb2009-10-235-2604/+0
* | Updated Italian translation of the helpMilo Casagrande2009-11-022-1011/+3938
* | Fixes cycling tab bug in chat window (#589263)Rômulo Fernandes Machado2009-10-301-12/+49
* | empathy-accounts-dialog: do_constructor: always return a new referenceGuillaume Desmottes2009-10-291-3/+7
* | empathy-accounts-dialog: do_constructor: don't ref the dialog if it already e...Guillaume Desmottes2009-10-291-1/+3
* | Escape the header of the notification (#599431)Guillaume Desmottes2009-10-291-2/+7
* | move test app needing user interaction to interactive/Guillaume Desmottes2009-10-2911-32/+45
* | Add new smileys available in the last Icon Naming Spec (#593327)Rodolphe2009-10-271-5/+11
* | Merge branch 'mc5-debug'Danielle Madeley2009-10-271-0/+7
|\ \
| * | Add MissionControl to the debug windowDanielle Madeley2009-10-271-0/+7
* | | Updated Tamil translationdrtvasudevan2009-10-271-150/+135
|/ /
* | release.py: update last_tag_paternGuillaume Desmottes2009-10-271-1/+1
* | start dev of 2.29.2Guillaume Desmottes2009-10-271-2/+2
* | prepare 2.29.1 releaseEMPATHY_2_29_1Guillaume Desmottes2009-10-272-1/+129
* | dispatcher_request_handles_cb: use request_data->dispatcher to get the self p...Guillaume Desmottes2009-10-261-1/+1
* | 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
* | Updated Slovenian translationMatej Urbančič2009-10-261-235/+237
* | Fix crash when joining a chat, GTK_WIDGET_VISIBLE is not NULL-safeXavier Claessens2009-10-261-2/+1
* | check-empathy-irc-network-manager: fix shadow declarationsJonny Lamb2009-10-251-6/+0
* | empathy-chat-window: Don't update the Contact menu if visibleRob Bradford2009-10-241-5/+26
* | empathy.c: document how the reference on the newly created EmpathyChat is man...Guillaume Desmottes2009-10-231-2/+9
|/
* ft-manager: allow closing the dialog with C-w or EscJonny Lamb2009-10-231-0/+17
* Set default font from Gnome system if not set in the style.Matěj Cepl2009-10-231-9/+73
* use empathy_released to check if we are releasing or notGuillaume Desmottes2009-10-231-9/+12
* Enable extra error CFLAGS in tests/Guillaume Desmottes2009-10-231-0/+1
* Enable extra error CFLAGS in libempathy/Guillaume Desmottes2009-10-231-0/+1
* Enable extra error CFLAGS in libempathy-gtk/Guillaume Desmottes2009-10-231-0/+1
* Enable extra error CFLAGS in src/Guillaume Desmottes2009-10-231-0/+1
* disable -Wstrict-prototypes as some GTK+ headers are buggedGuillaume Desmottes2009-10-231-1/+2
* remove m4/acinclude.m4Guillaume Desmottes2009-10-231-65/+0
* copy error flags from GabbleGuillaume Desmottes2009-10-231-1/+40
* add m4/as-compiler-flag.m4Guillaume Desmottes2009-10-231-0/+33
* copy version management from GabbleGuillaume Desmottes2009-10-231-1/+21
* empathy-protocol-chooser: don't cache TpConnectionManagerProtocol in the storeGuillaume Desmottes2009-10-231-28/+47
* Merge branch 'trivia'Guillaume Desmottes2009-10-2224-283/+300
|\
| * empathy-avatar-chooser.c: fix identationGuillaume Desmottes2009-10-221-2/+2
| * empathy-utils.c: fix casting issuesGuillaume Desmottes2009-10-221-6/+8
| * empathy-tp-contact-list.c: fix shadow declaration and uint comparaisonGuillaume Desmottes2009-10-221-6/+6
| * empathy-tp-contact-factory.c: fix casting issueGuillaume Desmottes2009-10-221-1/+1
| * empathy-time.c: fix shadow declarationGuillaume Desmottes2009-10-221-4/+4
| * empathy-status-presets.c: fix casting issuesGuillaume Desmottes2009-10-221-10/+10
| * empathy-log-store-empathy.c: fix casting issuesGuillaume Desmottes2009-10-221-12/+13
| * empathy-irc-network-manager.c: fix casting issuesGuillaume Desmottes2009-10-221-22/+29
| * empathy-dispatcher.c: fix shadow declarationsGuillaume Desmottes2009-10-221-123/+122
| * empathy-contact-groups.c: fix casting issuesGuillaume Desmottes2009-10-221-10/+11
| * empathy-connection-managers.c: fix shadow declarationsGuillaume Desmottes2009-10-221-14/+14
| * empathy-chatroom-manager.c: fix casting issuesGuillaume Desmottes2009-10-221-8/+12
| * empathy-account-settings.c: fix uint comparaisonGuillaume Desmottes2009-10-221-4/+4
| * empathy-nautilus-sendto.c: fix shadow declarationGuillaume Desmottes2009-10-221-1/+1
| * 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
* | Updated Thai translation.Theppitak Karoonboonyanan2009-10-221-4/+4
|/
* empathy-account-settings: fix CLAMP usageGuillaume Desmottes2009-10-221-7/+9
* 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
* empathy-tp-chat.c: fix shadow declarationGuillaume Desmottes2009-10-211-2/+2
* empathy-contact: cast data pointersGuillaume Desmottes2009-10-211-2/+4
* empathy-account-manager.c: fix uint comparaisonGuillaume Desmottes2009-10-211-1/+1
* empathy-irc-server: the port is a guintGuillaume Desmottes2009-10-211-1/+1
* Updated Lithuanian translation.Žygimantas Beručka2009-10-211-102/+73
* Merge commit 'kaserf/master'Guillaume Desmottes2009-10-211-1/+6
|\
| * Ignoring non installed languagesFelix Kaser2009-10-211-1/+6
* | Also allow Esc to close debug window and map view.Jonny Lamb2009-10-212-3/+4
* | Add Ctrl-w keybinding to close map window.Jonny Lamb2009-10-211-0/+17
|/
* Stop building libempathy{,-gtk} as a shared library. Closes bug #599086Jonny Lamb2009-10-216-135/+65
* Stop building gtk-doc documentation. Closes bug #599087Jonny Lamb2009-10-2116-394/+1
* src/ephy-spinner.c: remove useless guint comparaisonsGuillaume Desmottes2009-10-201-3/+2
* src/empathy.c: fix uint comparaisonGuillaume Desmottes2009-10-201-1/+1
* src/empathy-sidebar.c: fix shadow declarationsGuillaume Desmottes2009-10-201-12/+13
* src/empathy-main-window.c: fix shadow declarations and uint comparaisonsGuillaume Desmottes2009-10-201-7/+9
* src/empathy-preferences.c: fix shadow declarations and uint comparaisonsGuillaume Desmottes2009-10-201-3/+1
* src/empathy-import-pidgin: cast strings to (xmlChar *) when neededGuillaume Desmottes2009-10-201-3/+4
* src/empathy-import-mc4-accounts.c: fix uint comparaisonGuillaume Desmottes2009-10-201-1/+1
* src/empathy-debug-window: fix shadow declarations and uint comparaisonsGuillaume Desmottes2009-10-201-2/+2
* src/empathy-chat-window: fix shadow declarations and uint comparaisonsGuillaume Desmottes2009-10-201-16/+16
* empathy-call-window: fix shadow declarationsGuillaume Desmottes2009-10-201-4/+4
* Don't display any icon if we have been disconnectedGuillaume Desmottes2009-10-201-5/+15
* empathy-chat-window: update the tab icon when the TpChat is disconnected (#59...Guillaume Desmottes2009-10-201-1/+11
* Re-add python.m4 as it may be needed for AM_PATH_PYTHON.Jonny Lamb2009-10-201-0/+66
* Merge branch 'slatez-applets'Jonny Lamb2009-10-2021-1129/+0
|\
| * Remove the panel applets. (Closes bug #599042)Jonny Lamb2009-10-2021-1129/+0
* | Remove python bindings. (Closes bug #599039)Jonny Lamb2009-10-2017-6480/+0
|/
* Updated Russian translationLeonid Kanter2009-10-201-792/+1606
* release.py: stop hardcoding the GNOME username used for uploadsGuillaume Desmottes2009-10-201-1/+9
* Correctly lookup project page for release notesXavier Claessens2009-10-201-2/+2
* Updating Estonian translationMattias Põldaru2009-10-201-23/+61
* Updated Spanish translationJorge González2009-10-201-38/+38
* Use the contacts alias in the information dialogSjoerd Simons2009-10-201-1/+2
* Ensure we don't try to register invalid bus namesSjoerd Simons2009-10-201-5/+6
* Unset pending_call explicitly instead of implicitlySjoerd Simons2009-10-201-2/+11
* empathy_call_window_setup_avatars: pass a weak object to empathy_tp_contact_f...Guillaume Desmottes2009-10-191-1/+1
* Merge commit 'maiku/bug_598332'Guillaume Desmottes2009-10-191-20/+33
|\
| * Move destruction of connections from finalize to dispose.Mike Ruprecht2009-10-151-8/+12
| * Remove the weak_object parameter when requesting channels.Mike Ruprecht2009-10-151-8/+10
| * Cancel outstanding channel requests if connection to the CM is lost.Mike Ruprecht2009-10-141-4/+11
* | 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
* | empathy-call-window: use empathy_signal_connect_weak to connect the peak-leve...Guillaume Desmottes2009-10-191-2/+3
* | empathy_account_settings_get_tp_params: don't raise an error if tp_protocol i...Guillaume Desmottes2009-10-191-1/+9
* | empathy-account-settings: don't cache the TpConnectionManagerProtocolGuillaume Desmottes2009-10-191-6/+12
* | Make calling empathy without options idempotentSjoerd Simons2009-10-191-6/+21
* | Explain the -h option betterSjoerd Simons2009-10-191-2/+2
* | Fix assertion when closing a call window after CM crashed.Mike Ruprecht2009-10-191-2/+1
* | Updated Hungarian translationGabor Kelemen2009-10-191-1/+1
* | Updated Greek documentation translationJennie Petoumenou2009-10-171-921/+3604
* | idle: work around the case if the session doesn't tell us when we go idle (fi...Jonny Lamb2009-10-171-6/+17
* | debug-window: add C-w keybinding to close the windowJonny Lamb2009-10-171-0/+18
* | Updated Spanish translationJorge González2009-10-171-66/+52
* | Merge branch 'trrrrrrrrrrrrrivia'Jonny Lamb2009-10-172-9/+9
|\ \
| * | empathy-import-mc4-accounts: no need to add newlines to DEBUG callsJonny Lamb2009-10-171-7/+7
| * | connectivity: small fix to a debug messageJonny Lamb2009-10-171-2/+2
* | | Updated Brazilian Portuguese translation.André Gondim2009-10-161-131/+138
|/ /
* | 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
* | Updated Swedish translationDaniel Nylander2009-10-161-123/+761
* | Updated Swedish translationDaniel Nylander2009-10-161-58/+59
* | Updated French translation (and merged from gnome-2-28)Claude Paroz2009-10-161-154/+204
* | Make sure -h is respected when there were no mc4 accounts to importSjoerd Simons2009-10-151-1/+1
* | Factor out free-ing the message list.Cosimo Cecchi2009-10-151-4/+11
* | Implement a cache for debug logs (#596101).Cosimo Cecchi2009-10-151-54/+220
* | Don't try to double free the avatar data (#598423).Cosimo Cecchi2009-10-151-31/+11
* | Use new API in the test.Cosimo Cecchi2009-10-151-1/+1
* | Make sure the account manager is completely unreffed when exitingSjoerd Simons2009-10-151-1/+5
* | Let empathy -a show the assistant if applicableSjoerd Simons2009-10-151-11/+52
* | When starting hidden don't show the assistantSjoerd Simons2009-10-151-4/+5
* | Show the assistant if there are no non-salut accountsSjoerd Simons2009-10-153-10/+41
* | 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
* | accounts_dialog_add_account: connect notify::display-name using empathy_signa...Guillaume Desmottes2009-10-151-11/+3
* | copy empathy_signal_connect_weak from telepathy-gabbleGuillaume Desmottes2009-10-152-0/+90
* | Updated Greek translation.Kostas Papadimas2009-10-141-640/+809
* | Use the protocol display name for new account namesSjoerd Simons2009-10-141-1/+4
|/
* Updated Czech translation by Marek CernockyPetr Kovar2009-10-141-5/+5
* Fix typo, correctly set the description of the sound being played.Xavier Claessens2009-10-121-1/+1
* Merge branch 'refactor-context-menu'Gustavo Noronha Silva2009-10-122-126/+122
|\
| * Refactor context menu code to use new HitTestResult APIGustavo Noronha Silva2009-10-102-126/+122
* | Updated Tamil translationdrtvasudevan2009-10-111-199/+296
* | Updated Hungarian translationGabor Kelemen2009-10-111-123/+128
* | Updated Hungarian translationGabor Kelemen2009-10-111-34/+60
* | Updated Czech translation by Jan DrabekPetr Kovar2009-10-101-768/+869
* | Updated Spanish translationJorge González2009-10-101-99/+171
* | Improved French translationClaude Paroz2009-10-101-15/+17
* | Updated Italian translationMilo Casagrande2009-10-101-91/+124
|/
* Add missing ; to make it build.Xavier Claessens2009-10-091-1/+1
* Updated Bulgarian translationAlexander Shopov2009-10-071-92/+153
* Updated Catalan translationGil Forcada2009-10-061-744/+985
* Removed leak with g_string_free, added comment for 0xFFFCGabriel Millaire2009-10-061-1/+4
* accounts_dialog_account_display_name_changed_cb: check that accounts_dialog_m...Guillaume Desmottes2009-10-061-0/+3
* Updated Thai translation.Theppitak Karoonboonyanan2009-10-051-783/+1683
* Merge branch 'fix-headers-597293'Guillaume Desmottes2009-10-053-19/+0
|\
| * upgrade Python bindingsGuillaume Desmottes2009-10-051-15/+0
| * remove empathy_account_manager_remove from header; function has been removedGuillaume Desmottes2009-10-051-3/+0
| * remove empathy_tp_contact_list_can_add from header; function has been removedGuillaume Desmottes2009-10-051-1/+0
* | 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-053-32/+34
|/
* add myself as maintainerGuillaume Desmottes2009-10-052-0/+9
* Updated Slovenian translationMatej Urbančič2009-10-041-36/+62
* Updated German doc translationMario Blättermann2009-10-031-268/+577
* Updated italian translationMilo Casagrande2009-10-031-6/+7
* Updated Swedish translationDaniel Nylander2009-10-031-132/+179
* Updated Italian translationMilo Casagrande2009-10-031-70/+101
* Updated German translationMario Blättermann2009-10-031-113/+136
* empathy-accounts-dialog: 'Create' button should be 'Next' on MoblinGuillaume Desmottes2009-10-031-2/+3
* 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
* Fix a typo in a string.Cosimo Cecchi2009-10-031-1/+1