comparison libgaim/protocols/sametime/sametime.c @ 14262:baff095b146c

[gaim-migrate @ 16944] Rename GaimProxyConnectInfo to GaimProxyConnectData, and change the variables from connect_info to connect_data. Sorry, but I wanted to get this right before it becomes permanent. committer: Tailor Script <[e-mail]>

14261:bb060cdc23d1

  guint save_event;

  /** socket fd */
  int socket;
  gint outpa;  /* like inpa, but the other way */
  GaimProxyConnectInfo *connect_info;

  /** circular buffer for outgoing data */
  GaimCircBuffer *sock_buf;

  GaimConnection *gc;

static void connect_cb(gpointer data, gint source, const gchar *error_message) {

  struct mwGaimPluginData *pd = data;
  GaimConnection *gc = pd->gc;

  pd->connect_info = NULL;

  if(source < 0) {
    /* connection failed */

    if(pd->socket) {

  mwSession_setProperty(pd->session, mwSession_CLIENT_TYPE_ID,
			GUINT_TO_POINTER(client), NULL);

  gaim_connection_update_progress(gc, _("Connecting"), 1, MW_CONNECT_STEPS);

  pd->connect_info = gaim_proxy_connect(account, host, port, connect_cb, pd);
  if(pd->connect_info == NULL) {
    gaim_connection_error(gc, _("Unable to connect to host"));
  }
}

  if(gc->inpa) {
    gaim_input_remove(gc->inpa);
    gc->inpa = 0;
  }

  if(pd->connect_info != NULL) {
    gaim_proxy_connect_cancel(pd->connect_info);
    pd->connect_info = NULL;
  }

  /* clean up the rest */
  mwGaimPluginData_free(pd);
}

14262:baff095b146c

  guint save_event;

  /** socket fd */
  int socket;
  gint outpa;  /* like inpa, but the other way */
  GaimProxyConnectData *connect_data;

  /** circular buffer for outgoing data */
  GaimCircBuffer *sock_buf;

  GaimConnection *gc;

static void connect_cb(gpointer data, gint source, const gchar *error_message) {

  struct mwGaimPluginData *pd = data;
  GaimConnection *gc = pd->gc;

  pd->connect_data = NULL;

  if(source < 0) {
    /* connection failed */

    if(pd->socket) {

  mwSession_setProperty(pd->session, mwSession_CLIENT_TYPE_ID,
			GUINT_TO_POINTER(client), NULL);

  gaim_connection_update_progress(gc, _("Connecting"), 1, MW_CONNECT_STEPS);

  pd->connect_data = gaim_proxy_connect(account, host, port, connect_cb, pd);
  if(pd->connect_data == NULL) {
    gaim_connection_error(gc, _("Unable to connect to host"));
  }
}

  if(gc->inpa) {
    gaim_input_remove(gc->inpa);
    gc->inpa = 0;
  }

  if(pd->connect_data != NULL) {
    gaim_proxy_connect_cancel(pd->connect_data);
    pd->connect_data = NULL;
  }

  /* clean up the rest */
  mwGaimPluginData_free(pd);
}