comparison libpurple/protocols/sametime/sametime.c @ 21284:6de09629f091

propagate from branch 'im.pidgin.pidgin.next.minor' (head 0c9637482b845cc65e95a26e144697391c51133f) to branch 'im.pidgin.pidgin' (head e3a6991e78dac328f13804950fee54dfb8afc3c5)

21283:406aa3be6b32

  if(! ret) {
    DEBUG_INFO("connection reset\n");
    purple_connection_error(pd->gc, _("Connection reset"));

  } else if(ret < 0) {
    char *msg = strerror(err);

    DEBUG_INFO("error in read callback: %s\n", msg);

    msg = g_strdup_printf(_("Error reading from socket: %s"), msg);
    purple_connection_error(pd->gc, msg);

    mwFileTransfer_send(ft, &o);

  } else {
    int err = errno;
    DEBUG_WARN("problem reading from file %s: %s\n",
	       NSTR(mwFileTransfer_getFileName(ft)), strerror(err));

    mwFileTransfer_cancel(ft);
  }
}

  /* test that we can actually send the file */
  fp = g_fopen(filename, "rb");
  if(! fp) {
    char *msg = g_strdup_printf(_("Error reading file %s: \n%s\n"),
				filename, strerror(errno));
    purple_xfer_error(purple_xfer_get_type(xfer), acct, xfer->who, msg);
    g_free(msg);
    return;
  }
  fclose(fp);

	NULL,                                             /**< dependencies   */
	PURPLE_PRIORITY_DEFAULT,                          /**< priority       */

	PLUGIN_ID,                                        /**< id             */
	PLUGIN_NAME,                                      /**< name           */
	VERSION,                                          /**< version        */
	PLUGIN_SUMMARY,                                   /**< summary        */
	PLUGIN_DESC,                                      /**<  description    */
	PLUGIN_AUTHOR,                                    /**< author         */
	PLUGIN_HOMEPAGE,                                  /**< homepage       */

21284:6de09629f091

  if(! ret) {
    DEBUG_INFO("connection reset\n");
    purple_connection_error(pd->gc, _("Connection reset"));

  } else if(ret < 0) {
    char *msg = g_strerror(err);

    DEBUG_INFO("error in read callback: %s\n", msg);

    msg = g_strdup_printf(_("Error reading from socket: %s"), msg);
    purple_connection_error(pd->gc, msg);

    mwFileTransfer_send(ft, &o);

  } else {
    int err = errno;
    DEBUG_WARN("problem reading from file %s: %s\n",
	       NSTR(mwFileTransfer_getFileName(ft)), g_strerror(err));

    mwFileTransfer_cancel(ft);
  }
}

  /* test that we can actually send the file */
  fp = g_fopen(filename, "rb");
  if(! fp) {
    char *msg = g_strdup_printf(_("Error reading file %s: \n%s\n"),
				filename, g_strerror(errno));
    purple_xfer_error(purple_xfer_get_type(xfer), acct, xfer->who, msg);
    g_free(msg);
    return;
  }
  fclose(fp);

	NULL,                                             /**< dependencies   */
	PURPLE_PRIORITY_DEFAULT,                          /**< priority       */

	PLUGIN_ID,                                        /**< id             */
	PLUGIN_NAME,                                      /**< name           */
	DISPLAY_VERSION,                                  /**< version        */
	PLUGIN_SUMMARY,                                   /**< summary        */
	PLUGIN_DESC,                                      /**<  description    */
	PLUGIN_AUTHOR,                                    /**< author         */
	PLUGIN_HOMEPAGE,                                  /**< homepage       */