diff options
author | René Neumann <rene.neumann@in.tum.de> | 2012-05-07 11:05:46 +0200 |
---|---|---|
committer | René Neumann <rene.neumann@in.tum.de> | 2012-05-07 11:05:46 +0200 |
commit | 5db1f1178d7adc993167c603c2d494f5854a58d7 (patch) | |
tree | 6f8cb56696020cba251d4bdde18f06f9af082607 /net-im/spectrum/files/spectrum-1.4.7_remoteroster.patch | |
parent | 14bda47475d3b0d2171f5f740525ca7d1d7b3e5b (diff) | |
parent | 8142ad25b69d2df24ffeb86a941c97a7a124caaf (diff) | |
download | overlay-5db1f1178d7adc993167c603c2d494f5854a58d7.tar.gz overlay-5db1f1178d7adc993167c603c2d494f5854a58d7.tar.bz2 overlay-5db1f1178d7adc993167c603c2d494f5854a58d7.zip |
Merge branch 'master' of necoro.eu:gentoo/overlay
Diffstat (limited to 'net-im/spectrum/files/spectrum-1.4.7_remoteroster.patch')
-rw-r--r-- | net-im/spectrum/files/spectrum-1.4.7_remoteroster.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/net-im/spectrum/files/spectrum-1.4.7_remoteroster.patch b/net-im/spectrum/files/spectrum-1.4.7_remoteroster.patch deleted file mode 100644 index bd35d60..0000000 --- a/net-im/spectrum/files/spectrum-1.4.7_remoteroster.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/src/spectrumbuddy.cpp b/src/spectrumbuddy.cpp -index 74d5194..910266c 100644 ---- a/src/spectrumbuddy.cpp -+++ b/src/spectrumbuddy.cpp -@@ -36,10 +36,10 @@ SpectrumBuddy::~SpectrumBuddy() { - - std::string SpectrumBuddy::getAlias() { - std::string alias; -- if (purple_buddy_get_server_alias(m_buddy)) -- alias = (std::string) purple_buddy_get_server_alias(m_buddy); -- else -+ if (purple_buddy_get_alias(m_buddy)) - alias = (std::string) purple_buddy_get_alias(m_buddy); -+ else -+ alias = (std::string) purple_buddy_get_server_alias(m_buddy); - return alias; - } - -diff --git a/src/sql.cpp b/src/sql.cpp -index 8fbc64a..70bf5db 100644 ---- a/src/sql.cpp -+++ b/src/sql.cpp -@@ -905,7 +905,8 @@ GHashTable *SQLClass::getBuddies(long userId, PurpleAccount *account) { - // create buddy - buddy = purple_buddy_new(account, buddyUins[k].c_str(), buddyNicknames[k].c_str()); - purple_blist_add_buddy(buddy, contact, g, NULL); -- Log("ADDING BUDDY", buddyIds[k] << " " << buddyUins[k] << " subscription: " << subscription << " " << buddy); -+ purple_blist_server_alias_buddy(buddy, buddyNicknames[k].c_str()); -+ Log("ADDING BUDDY", buddyIds[k] << " " << buddyUins[k] << " " << buddyNicknames[k] << " subscription: " << subscription << " " << buddy); - - // add settings - GHashTable *settings = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify) purple_value_destroy); |