Compare commits

..

3 Commits

Author SHA1 Message Date
8150d341f2 Initial framework based off pidgin-icq 2021-04-10 14:52:27 +01:00
16710b62f6 Add some more code from pidgin-icq 2021-04-10 14:28:20 +01:00
24b022f535 Support libpurple 2.13
get_cb_alias was introduced in 2.14 and referencing it directly in this
macro breaks compilation against libpurple-2.13, as found in Debian
Buster.

https://docs.pidgin.im/pidgin/2.x.y/struct__PurplePluginProtocolInfo.html#ad43cef005f1634b0d170cc2972c69550
2021-04-10 14:26:42 +01:00
5 changed files with 3 additions and 70 deletions

1
.gitignore vendored
View File

@@ -1,2 +1 @@
/purple
/target

View File

@@ -1,7 +0,0 @@
run:
cargo build
rm -rf purple/plugins
mkdir -p purple/plugins
ln -s ../../target/debug/libpurple_delta.so purple/plugins/libpurple_delta.so
ldd purple/plugins/libpurple_delta.so
pidgin -d -c purple

View File

@@ -80,19 +80,7 @@ pub struct MsgInfo {
#[derive(Debug, Default)]
pub struct AccountData {
display_name: String,
imap_host: String,
imap_port: i32,
imap_user: String,
imap_pass: String,
smtp_host: String,
smtp_port: i32,
smtp_user: String,
smtp_pass: String,
bcc_self: bool,
// Not exposed: server_flags, selfstatus, e2ee_enabled
phone_number: String,
session_closed: AtomicBool,
// session: RwLock<Option<icq::protocol::SessionInfo>>,
}
@@ -140,7 +128,6 @@ impl purple::PrplPlugin for PurpleDelta {
context
.with_info(info)
.with_password()
.enable_login()
.enable_load()
.enable_close()
@@ -161,35 +148,9 @@ impl purple::PrplPlugin for PurpleDelta {
impl purple::LoginHandler for PurpleDelta {
fn login(&mut self, account: &mut Account) {
let display_name = account.get_string("displayname", "");
let imap_host = account.get_string("mail_server", "");
let imap_port = account.get_int("mail_port", 0);
let imap_user = account.get_username().unwrap().into();
let imap_pass = account.get_password().unwrap().into();
let smtp_host = account.get_string("send_server", "");
let smtp_port = account.get_int("send_port", 0);
let smtp_user = account.get_string("send_user", "");
let smtp_pass = account.get_string("send_pw", "");
let bcc_self = account.get_bool("bcc_self", false);
let phone_number = account.get_username().unwrap().into();
let protocol_data: AccountDataBox = Arc::new(AccountData {
display_name,
imap_host,
imap_port,
imap_user,
imap_pass,
smtp_host,
smtp_port,
smtp_user,
smtp_pass,
bcc_self,
phone_number,
session_closed: AtomicBool::new(false),
// session: RwLock::new(None),
});

View File

@@ -41,15 +41,6 @@ impl Account {
}
}
pub fn get_password(&self) -> Option<Cow<str>> {
let password_ptr = unsafe { purple_sys::purple_account_get_password(self.0) };
if password_ptr.is_null() {
None
} else {
Some(unsafe { CStr::from_ptr(password_ptr) }.to_string_lossy())
}
}
pub fn is_disconnected(&self) -> bool {
let is_disconnected = unsafe { purple_sys::purple_account_is_disconnected(self.0) };
is_disconnected != 0

View File

@@ -39,17 +39,6 @@ impl<P> RegisterContext<P> {
self.info.actions = Some(entrypoints::actions);
self
}
pub fn with_password(mut self) -> Self {
// purple_sys defaults extra_info.options to contain:
// OPT_PROTO_NO_PASSWORD | OPT_PROTO_IM_IMAGE | OPT_PROTO_CHAT_TOPIC
// All we have to do is remove the no_password one.
self.extra_info.options =
purple_sys::PurpleProtocolOptions::OPT_PROTO_IM_IMAGE |
purple_sys::PurpleProtocolOptions::OPT_PROTO_CHAT_TOPIC;
self
}
}
pub struct PrplPluginLoader<P: PrplPlugin>(*mut purple_sys::PurplePlugin, PhantomData<P>);