Mercurial > pidgin.yaz

comparison libpurple/protocols/novell/novell.c @ 21360:e747ac0c42d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin.next.minor' (head bd8f1d754a1b94e5ade30c3b135178b236f7b49a) to branch 'im.pidgin.cpw.resiak.disconnectreason' (head 5d84bcfaddc07cab4419ab9f04b31626421b97ff)
author Will Thompson <will.thompson@collabora.co.uk>
date Mon, 15 Oct 2007 10:45:46 +0000
parents ba41f2a60253 a20ef7180680
children 38cc722159ff
comparison
equal deleted inserted replaced
21359:fe57b8062249 21360:e747ac0c42d6
1919 parms = g_slist_append(parms, user); 1919 parms = g_slist_append(parms, user);
1920 parms = g_slist_append(parms, nm_event_get_conference(event)); 1920 parms = g_slist_append(parms, nm_event_get_conference(event));
1921 1921
1922 /* Prompt the user */ 1922 /* Prompt the user */
1923 gc = purple_account_get_connection(user->client_data); 1923 gc = purple_account_get_connection(user->client_data);
1924 purple_request_action(gc, title, primary, secondary, 1924 purple_request_action_with_hint(gc, title, primary, secondary,
1925 PURPLE_DEFAULT_ACTION_NONE, 1925 PURPLE_DEFAULT_ACTION_NONE,
1926 purple_connection_get_account(gc), name, NULL, 1926 purple_connection_get_account(gc), name, NULL,
1927 parms, 2, 1927 PURPLE_REQUEST_UI_HINT_CONV, parms, 2,
1928 _("Yes"), G_CALLBACK(_join_conference_cb), 1928 _("Yes"), G_CALLBACK(_join_conference_cb),
1929 _("No"), G_CALLBACK(_reject_conference_cb)); 1929 _("No"), G_CALLBACK(_reject_conference_cb));
1930 1930
1931 g_free(primary); 1931 g_free(primary);
1932 } 1932 }
2173 2173
2174 server = purple_account_get_string(account, "server", NULL); 2174 server = purple_account_get_string(account, "server", NULL);
2175 if (server == NULL || *server == '\0') { 2175 if (server == NULL || *server == '\0') {
2176 2176
2177 /* TODO: Would be nice to prompt if not set! 2177 /* TODO: Would be nice to prompt if not set!
2178 * purple_request_fields(gc, _("Server Address"),...); 2178 * purple_request_fields_with_hint(gc, _("Server Address"),...);
2179 */ 2179 */
2180 2180
2181 /* ...but for now just error out with a nice message. */ 2181 /* ...but for now just error out with a nice message. */
2182 purple_connection_error_reason (gc, 2182 purple_connection_error_reason (gc,
2183 PURPLE_CONNECTION_ERROR_INVALID_SETTINGS, 2183 PURPLE_CONNECTION_ERROR_INVALID_SETTINGS,