comparison libpurple/protocols/novell/novell.c @ 21099:51cf02dbdb0e

disapproval of revision 'c484d979c4fda4433a9633ff8b69bd8a395c9479'
author Richard Laager <rlaager@wiktel.com>
date Fri, 16 Nov 2007 23:30:03 +0000
parents cab348e39751
children fcb848b2d669
comparison
equal deleted inserted replaced
21095:cab348e39751 21099:51cf02dbdb0e
1910 parms = g_slist_append(parms, user); 1910 parms = g_slist_append(parms, user);
1911 parms = g_slist_append(parms, nm_event_get_conference(event)); 1911 parms = g_slist_append(parms, nm_event_get_conference(event));
1912 1912
1913 /* Prompt the user */ 1913 /* Prompt the user */
1914 gc = purple_account_get_connection(user->client_data); 1914 gc = purple_account_get_connection(user->client_data);
1915 purple_request_action_with_hint(gc, title, primary, secondary, 1915 purple_request_action(gc, title, primary, secondary,
1916 PURPLE_DEFAULT_ACTION_NONE, 1916 PURPLE_DEFAULT_ACTION_NONE,
1917 purple_connection_get_account(gc), name, NULL, 1917 purple_connection_get_account(gc), name, NULL,
1918 "chat", parms, 2, 1918 parms, 2,
1919 _("Yes"), G_CALLBACK(_join_conference_cb), 1919 _("Yes"), G_CALLBACK(_join_conference_cb),
1920 _("No"), G_CALLBACK(_reject_conference_cb)); 1920 _("No"), G_CALLBACK(_reject_conference_cb));
1921 1921
1922 g_free(primary); 1922 g_free(primary);
1923 } 1923 }
2163 2163
2164 server = purple_account_get_string(account, "server", NULL); 2164 server = purple_account_get_string(account, "server", NULL);
2165 if (server == NULL || *server == '\0') { 2165 if (server == NULL || *server == '\0') {
2166 2166
2167 /* TODO: Would be nice to prompt if not set! 2167 /* TODO: Would be nice to prompt if not set!
2168 * purple_request_fields_with_hint(gc, _("Server Address"),...); 2168 * purple_request_fields(gc, _("Server Address"),...);
2169 */ 2169 */
2170 2170
2171 /* ...but for now just error out with a nice message. */ 2171 /* ...but for now just error out with a nice message. */
2172 purple_connection_error(gc, _("Unable to connect to server." 2172 purple_connection_error(gc, _("Unable to connect to server."
2173 " Please enter the address of the server" 2173 " Please enter the address of the server"