Mercurial > pidgin
comparison libpurple/protocols/simple/simple.c @ 24988:f7a2045f9346
propagate from branch 'im.pidgin.pidgin' (head 7bd1f8a0fcc289166add1f0b4d84fdac526ab4a7)
to branch 'im.pidgin.pidgin.vv' (head 1656e035e23020316898b4fff6f70cb86c30b636)
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Sun, 04 Jan 2009 05:21:25 +0000 |
| parents | f0c2e27c7ae7 d378f05079e4 |
| children | 9fcff08ce726 |
comparison
equal
deleted
inserted
replaced
| 24987:c7d4b67b3332 | 24988:f7a2045f9346 |
|---|---|
| 1940 | 1940 |
| 1941 userserver = g_strsplit(username, "@", 2); | 1941 userserver = g_strsplit(username, "@", 2); |
| 1942 if (userserver[1] == NULL || userserver[1][0] == '\0') { | 1942 if (userserver[1] == NULL || userserver[1][0] == '\0') { |
| 1943 purple_connection_error_reason(gc, | 1943 purple_connection_error_reason(gc, |
| 1944 PURPLE_CONNECTION_ERROR_INVALID_SETTINGS, | 1944 PURPLE_CONNECTION_ERROR_INVALID_SETTINGS, |
| 1945 _("Unable to connect to server. Please enter the " | 1945 _("SIP connect server not specified")); |
| 1946 "address of the server you wish to connect to.")); | |
| 1947 return; | 1946 return; |
| 1948 } | 1947 } |
| 1949 | 1948 |
| 1950 purple_connection_set_display_name(gc, userserver[0]); | 1949 purple_connection_set_display_name(gc, userserver[0]); |
| 1951 sip->username = g_strdup(userserver[0]); | 1950 sip->username = g_strdup(userserver[0]); |