Mercurial > pidgin
changeset 24018:c0c82c50897f
Remove the (win32 only?!) QQ buddy icon pixmaps due to copyright concerns
author | Stu Tomlinson <stu@nosnilmot.com> |
---|---|
date | Sat, 30 Aug 2008 02:30:04 +0000 |
parents | 05907ea114ef |
children | 8691534526f1 |
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 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 |
diffstat | 108 files changed, 7 insertions(+), 156 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Sat Aug 30 02:05:36 2008 +0000 +++ b/configure.ac Sat Aug 30 02:30:04 2008 +0000 @@ -2377,7 +2377,6 @@ 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
--- a/libpurple/protocols/qq/buddy_info.c Sat Aug 30 02:05:36 2008 +0000 +++ b/libpurple/protocols/qq/buddy_info.c Sat Aug 30 02:30:04 2008 +0000 @@ -746,8 +746,8 @@ 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 @@ 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 @@ 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;
--- a/libpurple/protocols/qq/qq.h Sat Aug 30 02:05:36 2008 +0000 +++ b/libpurple/protocols/qq/qq.h Sat Aug 30 02:30:04 2008 +0000 @@ -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;
--- a/libpurple/protocols/qq/utils.c Sat Aug 30 02:05:36 2008 +0000 +++ b/libpurple/protocols/qq/utils.c Sat Aug 30 02:30:04 2008 +0000 @@ -397,16 +397,5 @@ 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
--- a/libpurple/protocols/qq/utils.h Sat Aug 30 02:05:36 2008 +0000 +++ b/libpurple/protocols/qq/utils.h Sat Aug 30 02:30:04 2008 +0000 @@ -56,6 +56,5 @@ 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
--- a/pidgin/pixmaps/Makefile.am Sat Aug 30 02:05:36 2008 +0000 +++ b/pidgin/pixmaps/Makefile.am Sat Aug 30 02:30:04 2008 +0000 @@ -1,11 +1,10 @@ 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
--- a/pidgin/pixmaps/buddy_icons/qq/Makefile.am Sat Aug 30 02:05:36 2008 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,107 +0,0 @@ -EXTRA_DIST = \ - qq_1.png \ - qq_2.png \ - qq_3.png \ - qq_4.png \ - qq_5.png \ - qq_6.png \ - qq_7.png \ - qq_8.png \ - qq_9.png \ - qq_10.png \ - qq_11.png \ - qq_12.png \ - qq_13.png \ - qq_14.png \ - qq_15.png \ - qq_16.png \ - qq_17.png \ - qq_18.png \ - qq_19.png \ - qq_20.png \ - qq_21.png \ - qq_22.png \ - qq_23.png \ - qq_24.png \ - qq_25.png \ - qq_26.png \ - qq_27.png \ - qq_28.png \ - qq_29.png \ - qq_30.png \ - qq_31.png \ - qq_32.png \ - qq_33.png \ - qq_34.png \ - qq_35.png \ - qq_36.png \ - qq_37.png \ - qq_38.png \ - qq_39.png \ - qq_40.png \ - qq_41.png \ - qq_42.png \ - qq_43.png \ - qq_44.png \ - qq_45.png \ - qq_46.png \ - qq_47.png \ - qq_48.png \ - qq_49.png \ - qq_50.png \ - qq_51.png \ - qq_52.png \ - qq_53.png \ - qq_54.png \ - qq_55.png \ - qq_56.png \ - qq_57.png \ - qq_58.png \ - qq_59.png \ - qq_60.png \ - qq_61.png \ - qq_62.png \ - qq_63.png \ - qq_64.png \ - qq_65.png \ - qq_66.png \ - qq_67.png \ - qq_68.png \ - qq_69.png \ - qq_70.png \ - qq_71.png \ - qq_72.png \ - qq_73.png \ - qq_74.png \ - qq_75.png \ - qq_76.png \ - qq_77.png \ - qq_78.png \ - qq_79.png \ - qq_80.png \ - qq_81.png \ - qq_82.png \ - qq_83.png \ - qq_84.png \ - qq_85.png \ - qq_86.png \ - qq_87.png \ - qq_88.png \ - qq_89.png \ - qq_90.png \ - qq_91.png \ - qq_92.png \ - qq_93.png \ - qq_94.png \ - qq_95.png \ - qq_96.png \ - qq_97.png \ - qq_98.png \ - qq_99.png \ - qq_100.png - -if INSTALL_PIXMAPS -qqbuddyiconspixdir = $(datadir)/pixmaps/purple/buddy_icons/qq - -qqbuddyiconspix_DATA = $(EXTRA_DIST) -endif
--- a/pidgin/pixmaps/buddy_icons/qq/Makefile.mingw Sat Aug 30 02:05:36 2008 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -# -## Makefile.mingw -# -## Description: Makefile for win32 (mingw) version of Pidgin QQ buddy icons -# -# - -PIDGIN_TREE_TOP = ../../../.. -include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak - -datadir = $(PIDGIN_INSTALL_DIR) --include ./Makefile.am.mingw - -install: ./Makefile.am.mingw - if test '$(qqbuddyiconspix_DATA)'; then \ - mkdir -p $(qqbuddyiconspixdir); \ - cp $(qqbuddyiconspix_DATA) $(qqbuddyiconspixdir); \ - fi; - -./Makefile.am.mingw: ./Makefile.am - sed -e 's/^if\ INSTALL_PIXMAPS/ifeq (\$$(INSTALL_PIXMAPS), 1)/' ./Makefile.am > $@ - include $@ -