pidgin: 0c4505a6: Remove the (win32 only?!) QQ buddy icon ...
nosnilmot at pidgin.im
nosnilmot at pidgin.im
Fri Aug 29 22:37:12 EDT 2008
-----------------------------------------------------------------
Revision: 0c4505a67ab2e90bf634a3d235022d369302e129
Ancestor: 9242889cad50d580e8f6ea55d98002fd30d90273
Author: nosnilmot at pidgin.im
Date: 2008-08-30T02:30:04
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/0c4505a67ab2e90bf634a3d235022d369302e129
Deleted entries:
pidgin/pixmaps/buddy_icons pidgin/pixmaps/buddy_icons/qq
pidgin/pixmaps/buddy_icons/qq/Makefile.am
pidgin/pixmaps/buddy_icons/qq/Makefile.mingw
pidgin/pixmaps/buddy_icons/qq/qq_1.png
pidgin/pixmaps/buddy_icons/qq/qq_10.png
pidgin/pixmaps/buddy_icons/qq/qq_100.png
pidgin/pixmaps/buddy_icons/qq/qq_11.png
pidgin/pixmaps/buddy_icons/qq/qq_12.png
pidgin/pixmaps/buddy_icons/qq/qq_13.png
pidgin/pixmaps/buddy_icons/qq/qq_14.png
pidgin/pixmaps/buddy_icons/qq/qq_15.png
pidgin/pixmaps/buddy_icons/qq/qq_16.png
pidgin/pixmaps/buddy_icons/qq/qq_17.png
pidgin/pixmaps/buddy_icons/qq/qq_18.png
pidgin/pixmaps/buddy_icons/qq/qq_19.png
pidgin/pixmaps/buddy_icons/qq/qq_2.png
pidgin/pixmaps/buddy_icons/qq/qq_20.png
pidgin/pixmaps/buddy_icons/qq/qq_21.png
pidgin/pixmaps/buddy_icons/qq/qq_22.png
pidgin/pixmaps/buddy_icons/qq/qq_23.png
pidgin/pixmaps/buddy_icons/qq/qq_24.png
pidgin/pixmaps/buddy_icons/qq/qq_25.png
pidgin/pixmaps/buddy_icons/qq/qq_26.png
pidgin/pixmaps/buddy_icons/qq/qq_27.png
pidgin/pixmaps/buddy_icons/qq/qq_28.png
pidgin/pixmaps/buddy_icons/qq/qq_29.png
pidgin/pixmaps/buddy_icons/qq/qq_3.png
pidgin/pixmaps/buddy_icons/qq/qq_30.png
pidgin/pixmaps/buddy_icons/qq/qq_31.png
pidgin/pixmaps/buddy_icons/qq/qq_32.png
pidgin/pixmaps/buddy_icons/qq/qq_33.png
pidgin/pixmaps/buddy_icons/qq/qq_34.png
pidgin/pixmaps/buddy_icons/qq/qq_35.png
pidgin/pixmaps/buddy_icons/qq/qq_36.png
pidgin/pixmaps/buddy_icons/qq/qq_37.png
pidgin/pixmaps/buddy_icons/qq/qq_38.png
pidgin/pixmaps/buddy_icons/qq/qq_39.png
pidgin/pixmaps/buddy_icons/qq/qq_4.png
pidgin/pixmaps/buddy_icons/qq/qq_40.png
pidgin/pixmaps/buddy_icons/qq/qq_41.png
pidgin/pixmaps/buddy_icons/qq/qq_42.png
pidgin/pixmaps/buddy_icons/qq/qq_43.png
pidgin/pixmaps/buddy_icons/qq/qq_44.png
pidgin/pixmaps/buddy_icons/qq/qq_45.png
pidgin/pixmaps/buddy_icons/qq/qq_46.png
pidgin/pixmaps/buddy_icons/qq/qq_47.png
pidgin/pixmaps/buddy_icons/qq/qq_48.png
pidgin/pixmaps/buddy_icons/qq/qq_49.png
pidgin/pixmaps/buddy_icons/qq/qq_5.png
pidgin/pixmaps/buddy_icons/qq/qq_50.png
pidgin/pixmaps/buddy_icons/qq/qq_51.png
pidgin/pixmaps/buddy_icons/qq/qq_52.png
pidgin/pixmaps/buddy_icons/qq/qq_53.png
pidgin/pixmaps/buddy_icons/qq/qq_54.png
pidgin/pixmaps/buddy_icons/qq/qq_55.png
pidgin/pixmaps/buddy_icons/qq/qq_56.png
pidgin/pixmaps/buddy_icons/qq/qq_57.png
pidgin/pixmaps/buddy_icons/qq/qq_58.png
pidgin/pixmaps/buddy_icons/qq/qq_59.png
pidgin/pixmaps/buddy_icons/qq/qq_6.png
pidgin/pixmaps/buddy_icons/qq/qq_60.png
pidgin/pixmaps/buddy_icons/qq/qq_61.png
pidgin/pixmaps/buddy_icons/qq/qq_62.png
pidgin/pixmaps/buddy_icons/qq/qq_63.png
pidgin/pixmaps/buddy_icons/qq/qq_64.png
pidgin/pixmaps/buddy_icons/qq/qq_65.png
pidgin/pixmaps/buddy_icons/qq/qq_66.png
pidgin/pixmaps/buddy_icons/qq/qq_67.png
pidgin/pixmaps/buddy_icons/qq/qq_68.png
pidgin/pixmaps/buddy_icons/qq/qq_69.png
pidgin/pixmaps/buddy_icons/qq/qq_7.png
pidgin/pixmaps/buddy_icons/qq/qq_70.png
pidgin/pixmaps/buddy_icons/qq/qq_71.png
pidgin/pixmaps/buddy_icons/qq/qq_72.png
pidgin/pixmaps/buddy_icons/qq/qq_73.png
pidgin/pixmaps/buddy_icons/qq/qq_74.png
pidgin/pixmaps/buddy_icons/qq/qq_75.png
pidgin/pixmaps/buddy_icons/qq/qq_76.png
pidgin/pixmaps/buddy_icons/qq/qq_77.png
pidgin/pixmaps/buddy_icons/qq/qq_78.png
pidgin/pixmaps/buddy_icons/qq/qq_79.png
pidgin/pixmaps/buddy_icons/qq/qq_8.png
pidgin/pixmaps/buddy_icons/qq/qq_80.png
pidgin/pixmaps/buddy_icons/qq/qq_81.png
pidgin/pixmaps/buddy_icons/qq/qq_82.png
pidgin/pixmaps/buddy_icons/qq/qq_83.png
pidgin/pixmaps/buddy_icons/qq/qq_84.png
pidgin/pixmaps/buddy_icons/qq/qq_85.png
pidgin/pixmaps/buddy_icons/qq/qq_86.png
pidgin/pixmaps/buddy_icons/qq/qq_87.png
pidgin/pixmaps/buddy_icons/qq/qq_88.png
pidgin/pixmaps/buddy_icons/qq/qq_89.png
pidgin/pixmaps/buddy_icons/qq/qq_9.png
pidgin/pixmaps/buddy_icons/qq/qq_90.png
pidgin/pixmaps/buddy_icons/qq/qq_91.png
pidgin/pixmaps/buddy_icons/qq/qq_92.png
pidgin/pixmaps/buddy_icons/qq/qq_93.png
pidgin/pixmaps/buddy_icons/qq/qq_94.png
pidgin/pixmaps/buddy_icons/qq/qq_95.png
pidgin/pixmaps/buddy_icons/qq/qq_96.png
pidgin/pixmaps/buddy_icons/qq/qq_97.png
pidgin/pixmaps/buddy_icons/qq/qq_98.png
pidgin/pixmaps/buddy_icons/qq/qq_99.png
Modified files:
configure.ac libpurple/protocols/qq/buddy_info.c
libpurple/protocols/qq/qq.h libpurple/protocols/qq/utils.c
libpurple/protocols/qq/utils.h pidgin/pixmaps/Makefile.am
ChangeLog:
Remove the (win32 only?!) QQ buddy icon pixmaps due to copyright concerns
-------------- next part --------------
============================================================
--- configure.ac 5f5c0418eed7c02dee3dbf4cb7da880da98365ce
+++ configure.ac 5f20a9e47318892f4ba9265188d45c9a63082bbf
@@ -2377,7 +2377,6 @@ AC_OUTPUT([Makefile
pidgin/pidgin.pc
pidgin/pidgin-uninstalled.pc
pidgin/pixmaps/Makefile
- pidgin/pixmaps/buddy_icons/qq/Makefile
pidgin/pixmaps/emotes/default/24/Makefile
pidgin/pixmaps/emotes/none/Makefile
pidgin/plugins/Makefile
============================================================
--- libpurple/protocols/qq/buddy_info.c 83e9954420861fa2cae9a61edd172acad03bc383
+++ libpurple/protocols/qq/buddy_info.c 6903a2b652ab9269e046c9bf44f9d11371a42a17
@@ -746,8 +746,8 @@ void qq_set_my_buddy_icon(PurpleConnecti
const gchar *buddy_icon_dir = qq_buddy_icon_dir();
gint prefix_len = strlen(QQ_ICON_PREFIX);
gint suffix_len = strlen(QQ_ICON_SUFFIX);
- gint dir_len = strlen(buddy_icon_dir);
- gchar *errmsg = g_strdup_printf(_("Setting custom faces is not currently supported. Please choose an image from %s."), buddy_icon_dir);
+ gint dir_len = buddy_icon_dir ? strlen(buddy_icon_dir) : 0;
+ gchar *errmsg = g_strdup_printf(_("Setting custom faces is not currently supported. Please choose an image from %s."), buddy_icon_dir ? buddy_icon_dir : "(null)");
gboolean icon_global = purple_account_get_bool(gc->account, "use-global-buddyicon", TRUE);
if (!icon_path)
@@ -756,7 +756,7 @@ void qq_set_my_buddy_icon(PurpleConnecti
icon_len = strlen(icon_path) - dir_len - 1 - prefix_len - suffix_len;
/* make sure we're using an appropriate icon */
- if (!(g_ascii_strncasecmp(icon_path, buddy_icon_dir, dir_len) == 0
+ if (buddy_icon_dir && !(g_ascii_strncasecmp(icon_path, buddy_icon_dir, dir_len) == 0
&& icon_path[dir_len] == G_DIR_SEPARATOR
&& g_ascii_strncasecmp(icon_path + dir_len + 1, QQ_ICON_PREFIX, prefix_len) == 0
&& g_ascii_strncasecmp(icon_path + dir_len + 1 + prefix_len + icon_len, QQ_ICON_SUFFIX, suffix_len) == 0
@@ -798,8 +798,8 @@ static void _qq_update_buddy_icon(Purple
if ((buddy = purple_find_buddy(account, name)))
old_icon_num = purple_buddy_icons_get_checksum_for_user(buddy);
- if (old_icon_num == NULL ||
- strcmp(icon_num_str, old_icon_num))
+ if ((old_icon_num == NULL ||
+ strcmp(icon_num_str, old_icon_num)) && (qq_buddy_icon_dir() != NULL))
{
gchar *icon_path;
============================================================
--- libpurple/protocols/qq/qq.h 974b192d233ebed29ca2e79a6beb63d54167215e
+++ libpurple/protocols/qq/qq.h 17c7a1179cc82fcae2d3231ddf7883b78b7a9804
@@ -36,11 +36,6 @@
#define QQ_KEY_LENGTH 16
-#ifdef _WIN32
-const char *qq_win32_buddy_icon_dir(void);
-#define QQ_BUDDY_ICON_DIR qq_win32_buddy_icon_dir()
-#endif
-
typedef struct _qq_data qq_data;
typedef struct _qq_buddy qq_buddy;
typedef struct _qq_interval qq_interval;
============================================================
--- libpurple/protocols/qq/utils.c 9dc69d41de8ced4739e415b0894c7f9a52832847
+++ libpurple/protocols/qq/utils.c 034fd3fc8d7e12ad0491c8e5b6bc0799c1d2a10b
@@ -397,16 +397,5 @@ const char *qq_buddy_icon_dir(void)
if (purple_prefs_exists("/prpl/qq/buddy_icon_dir"))
return purple_prefs_get_string("/prpl/qq/buddy_icon_dir");
else
- return QQ_BUDDY_ICON_DIR;
+ return NULL;
}
-
-#ifdef _WIN32
-const char *qq_win32_buddy_icon_dir(void)
-{
- static char *dir = NULL;
- if (dir == NULL)
- dir = g_build_filename(wpurple_install_dir(), "pixmaps",
- "purple", "buddy_icons", "qq", NULL);
- return dir;
-}
-#endif
============================================================
--- libpurple/protocols/qq/utils.h a391181cf3622cac8ce340dc75b39779c362456b
+++ libpurple/protocols/qq/utils.h fe344b9710669a7efae22d9cc4180d2ae7423150
@@ -56,6 +56,5 @@ const gchar *qq_buddy_icon_dir(void);
guint8 *hex_str_to_bytes(const gchar *buf, gint *out_len);
const gchar *qq_buddy_icon_dir(void);
-const gchar *qq_win32_buddy_icon_dir(void);
#endif
============================================================
--- pidgin/pixmaps/Makefile.am 39840748c317cfb8ade8457d308559f0ca410f01
+++ pidgin/pixmaps/Makefile.am afe4586dfd4d2049b0545009555652cde33d3e00
@@ -1,11 +1,10 @@ pidginiconsdir = $(datadir)
pidginpixmapdir = $(datadir)/pixmaps/pidgin
pidginiconsdir = $(datadir)
-SUBDIRS = buddy_icons/qq emotes/default/24 emotes/none
+SUBDIRS = emotes/default/24 emotes/none
if INSTALL_PIXMAPS
MAKEFILE_MINGW = \
- buddy_icons/qq/Makefile.mingw \
emotes/default/24/Makefile.mingw \
emotes/none/Makefile.mingw
More information about the Commits
mailing list