Hello community, here is the log from the commit of package skype4pidgin for openSUSE:Factory checked in at 2016-10-26 13:29:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/skype4pidgin (Old) and /work/SRC/openSUSE:Factory/.skype4pidgin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "skype4pidgin" Changes: -------- --- /work/SRC/openSUSE:Factory/skype4pidgin/skype4pidgin.changes 2016-08-12 15:57:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.skype4pidgin.new/skype4pidgin.changes 2016-10-26 13:29:27.000000000 +0200 @@ -1,0 +2,10 @@ +Sun Oct 16 16:23:46 UTC 2016 - [email protected] + +- Update to version 1.2.2: + * Fix Logins for non-Outlook usernames (i.e. if you don't have an + "@" in your username). + * Don't remember/use the refresh-token for auth if the user have + marked the account to always require the password – this will + make sure the user can't just use any password to login. + +------------------------------------------------------------------- Old: ---- skype4pidgin-1.2.1.tar.gz New: ---- skype4pidgin-1.2.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skype4pidgin.spec ++++++ --- /var/tmp/diff_new_pack.NTaIO9/_old 2016-10-26 13:29:28.000000000 +0200 +++ /var/tmp/diff_new_pack.NTaIO9/_new 2016-10-26 13:29:28.000000000 +0200 @@ -17,7 +17,7 @@ Name: skype4pidgin -Version: 1.2.1 +Version: 1.2.2 Release: 0 Summary: Libpurple plugin for Skype API License: GPL-3.0+ @@ -97,8 +97,8 @@ %patch1 -p1 %build -make all %{?_smp_mflags} -make %{?_smp_mflags} -C skypeweb +make all %{?_smp_mflags} V=1 +make %{?_smp_mflags} V=1 -C skypeweb %install %make_install LIB=%{_lib} @@ -107,7 +107,7 @@ # Manually install translations for libpurple-plugin-skype. mkdir -p %{buildroot}%{_datadir}/locale/ ls po/ | while read file; do - install -Dm 0644 "po/$file" "%{buildroot}%{_datadir}/locale/${file/.mo}/LC_MESSAGES/%{name}.mo" + install -Dpm 0644 "po/$file" "%{buildroot}%{_datadir}/locale/${file/.mo}/LC_MESSAGES/%{name}.mo" done %find_lang %{name} ++++++ skype4pidgin-1.2.1.tar.gz -> skype4pidgin-1.2.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skype4pidgin-1.2.1/skypeweb/CMakeLists.txt new/skype4pidgin-1.2.2/skypeweb/CMakeLists.txt --- old/skype4pidgin-1.2.1/skypeweb/CMakeLists.txt 2016-08-08 09:32:12.000000000 +0200 +++ new/skype4pidgin-1.2.2/skypeweb/CMakeLists.txt 2016-10-16 01:40:50.000000000 +0200 @@ -3,7 +3,7 @@ set(PROJECT_NAME "skypeweb") set(VERSION_MAJOR "1") set(VERSION_MINOR "2") -set(VERSION_PATCH "1") +set(VERSION_PATCH "2") project(${PROJECT_NAME}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skype4pidgin-1.2.1/skypeweb/README.md new/skype4pidgin-1.2.2/skypeweb/README.md --- old/skype4pidgin-1.2.1/skypeweb/README.md 2016-08-08 09:32:12.000000000 +0200 +++ new/skype4pidgin-1.2.2/skypeweb/README.md 2016-10-16 01:40:50.000000000 +0200 @@ -7,6 +7,7 @@ Change Log ---------- + * 1.2.2 - Fixes non-Live logins * 1.2.1 - Fixes support for Live logins again, fixes setting mood message setting, fixes friend search, hopefully less disconnects * 1.2 - Adds support for libpurple 2.11.0, allows setting "mood" messages * 1.1 - Support file transfers, fix for Live logins, fix for other crashes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skype4pidgin-1.2.1/skypeweb/libskypeweb.c new/skype4pidgin-1.2.2/skypeweb/libskypeweb.c --- old/skype4pidgin-1.2.1/skypeweb/libskypeweb.c 2016-08-08 09:32:12.000000000 +0200 +++ new/skype4pidgin-1.2.2/skypeweb/libskypeweb.c 2016-10-16 01:40:50.000000000 +0200 @@ -322,18 +322,14 @@ sa->messages_host = g_strdup(SKYPEWEB_DEFAULT_MESSAGES_HOST); sa->url_datas = NULL; - if (purple_account_get_string(account, "refresh-token", NULL)) { + if (purple_account_get_string(account, "refresh-token", NULL) && purple_account_get_remember_password(account)) { skypeweb_refresh_token_login(sa); } else { - if (strchr(purple_account_get_username(account), '@')) { - //Has an email address for a username, probably a microsoft account? - skypeweb_begin_oauth_login(sa); - } else { - skypeweb_begin_web_login(sa); - } + skypeweb_begin_oauth_login(sa); } purple_signal_connect(purple_conversations_get_handle(), "conversation-updated", pc, PURPLE_CALLBACK(skypeweb_mark_conv_seen), NULL); + purple_signal_connect(purple_conversations_get_handle(), "chat-conversation-typing", account, PURPLE_CALLBACK(skypeweb_conv_send_typing), sa); } static void diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skype4pidgin-1.2.1/skypeweb/libskypeweb.h new/skype4pidgin-1.2.2/skypeweb/libskypeweb.h --- old/skype4pidgin-1.2.1/skypeweb/libskypeweb.h 2016-08-08 09:32:12.000000000 +0200 +++ new/skype4pidgin-1.2.2/skypeweb/libskypeweb.h 2016-10-16 01:40:50.000000000 +0200 @@ -250,7 +250,7 @@ #define SKYPEWEB_MAX_MSG_RETRY 2 #define SKYPEWEB_PLUGIN_ID "prpl-skypeweb" -#define SKYPEWEB_PLUGIN_VERSION "1.2.1" +#define SKYPEWEB_PLUGIN_VERSION "1.2.2" #define SKYPEWEB_LOCKANDKEY_APPID "[email protected]" #define SKYPEWEB_LOCKANDKEY_SECRET "Q1P7W2E4J9R8U3S5" @@ -264,7 +264,7 @@ #define SKYPEWEB_GRAPH_HOST "skypegraph.skype.com" #define SKYPEWEB_CLIENTINFO_NAME "swx-skype.com" -#define SKYPEWEB_CLIENTINFO_VERSION "908/1.50.53" +#define SKYPEWEB_CLIENTINFO_VERSION "908/1.63.51" #define SKYPEWEB_BUDDY_IS_MSN(a) G_UNLIKELY((a) != NULL && strchr((a), '@') != NULL) #define SKYPEWEB_BUDDY_IS_PHONE(a) G_UNLIKELY((a) != NULL && *(a) == '+') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skype4pidgin-1.2.1/skypeweb/pidgin-skypeweb.nsi new/skype4pidgin-1.2.2/skypeweb/pidgin-skypeweb.nsi --- old/skype4pidgin-1.2.1/skypeweb/pidgin-skypeweb.nsi 2016-08-08 09:32:12.000000000 +0200 +++ new/skype4pidgin-1.2.2/skypeweb/pidgin-skypeweb.nsi 2016-10-16 01:40:50.000000000 +0200 @@ -9,7 +9,7 @@ !define PRODUCT_NAME "pidgin-skypeweb" !endif !ifndef PRODUCT_VERSION -!define PRODUCT_VERSION "v1.2.1" +!define PRODUCT_VERSION "v1.2.2" !endif !define PRODUCT_PUBLISHER "Eion Robb" !define PRODUCT_WEB_SITE "http://eion.robbmob.com/"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skype4pidgin-1.2.1/skypeweb/skypeweb_login.c new/skype4pidgin-1.2.2/skypeweb/skypeweb_login.c --- old/skype4pidgin-1.2.1/skypeweb/skypeweb_login.c 2016-08-08 09:32:12.000000000 +0200 +++ new/skype4pidgin-1.2.2/skypeweb/skypeweb_login.c 2016-10-16 01:40:50.000000000 +0200 @@ -50,7 +50,9 @@ sa->skype_token = refresh_token; skypeweb_update_cookies(sa, url_text); - purple_account_set_string(sa->account, "refresh-token", g_hash_table_lookup(sa->cookie_table, "refresh-token")); + if (purple_account_get_remember_password(sa->account)) { + purple_account_set_string(sa->account, "refresh-token", g_hash_table_lookup(sa->cookie_table, "refresh-token")); + } skypeweb_do_all_the_things(sa); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skype4pidgin-1.2.1/skypeweb/skypeweb_messages.c new/skype4pidgin-1.2.2/skypeweb/skypeweb_messages.c --- old/skype4pidgin-1.2.1/skypeweb/skypeweb_messages.c 2016-08-08 09:32:12.000000000 +0200 +++ new/skype4pidgin-1.2.2/skypeweb/skypeweb_messages.c 2016-10-16 01:40:50.000000000 +0200 @@ -1100,6 +1100,30 @@ +guint +skypeweb_conv_send_typing(PurpleConversation *conv, PurpleIMTypingState state, SkypeWebAccount *sa) +{ + gchar *post, *url; + JsonObject *obj; + + url = g_strdup_printf("/v1/users/ME/conversations/%s/messages", purple_url_encode(purple_conversation_get_name(conv))); + + obj = json_object_new(); + json_object_set_int_member(obj, "clientmessageid", time(NULL)); + json_object_set_string_member(obj, "content", ""); + json_object_set_string_member(obj, "messagetype", state == PURPLE_IM_TYPING ? "Control/Typing" : "Control/ClearTyping"); + json_object_set_string_member(obj, "contenttype", "text"); + + post = skypeweb_jsonobj_to_string(obj); + + skypeweb_post_or_get(sa, SKYPEWEB_METHOD_POST | SKYPEWEB_METHOD_SSL, sa->messages_host, url, post, NULL, NULL, TRUE); + + g_free(post); + json_object_unref(obj); + g_free(url); + + return 5; +} guint skypeweb_send_typing(PurpleConnection *pc, const gchar *name, PurpleIMTypingState state) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skype4pidgin-1.2.1/skypeweb/skypeweb_messages.h new/skype4pidgin-1.2.2/skypeweb/skypeweb_messages.h --- old/skype4pidgin-1.2.1/skypeweb/skypeweb_messages.h 2016-08-08 09:32:12.000000000 +0200 +++ new/skype4pidgin-1.2.2/skypeweb/skypeweb_messages.h 2016-10-16 01:40:50.000000000 +0200 @@ -25,6 +25,7 @@ gint skypeweb_chat_send(PurpleConnection *pc, gint id, const gchar *message, PurpleMessageFlags flags); void skypeweb_set_idle(PurpleConnection *pc, int time); void skypeweb_set_status(PurpleAccount *account, PurpleStatus *status); +guint skypeweb_conv_send_typing(PurpleConversation *conv, PurpleIMTypingState state, SkypeWebAccount *sa); guint skypeweb_send_typing(PurpleConnection *pc, const gchar *name, PurpleIMTypingState state); void skypeweb_poll(SkypeWebAccount *sa); void skypeweb_get_registration_token(SkypeWebAccount *sa);
