pidgin: e5096e63: Update these comments based on Kevin's r...

markdoliner at pidgin.im markdoliner at pidgin.im
Tue Jul 14 03:50:27 EDT 2009


-----------------------------------------------------------------
Revision: e5096e634bd0f96125b0c5b7c60b09c336059079
Ancestor: f7840b15d24f0c00bab1233780002441e3b642dc
Author: markdoliner at pidgin.im
Date: 2009-07-14T07:46:24
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e5096e634bd0f96125b0c5b7c60b09c336059079

Modified files:
        libpurple/protocols/qq/Makefile.am
        libpurple/protocols/qq/buddy_info.c

ChangeLog: 

Update these comments based on Kevin's reply a week ago on the devel
mailing list

-------------- next part --------------
============================================================
--- libpurple/protocols/qq/Makefile.am	6108672b34fccc7359980028d05cbd7d4e0df3d3
+++ libpurple/protocols/qq/Makefile.am	804d8057efc64ccd120d5670e0cff27e11b73c5f
@@ -71,6 +71,10 @@ endif
 
 endif
 
+# QQ_BUDDY_ICON_DIR is the path where a bunch of stock icons can be
+# places for users to choose from when setting their buddy icon.  We
+# don't distribute those icons ourselves because of possibly copyright
+# concerns, but distributions might want to put icons here.
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
============================================================
--- libpurple/protocols/qq/buddy_info.c	9e147435e11520bdc8d2b188a9a7f5046ea89a6b
+++ libpurple/protocols/qq/buddy_info.c	dba29efd8c78cc7807f80e46b11aa6fc9b06a0f8
@@ -531,13 +531,11 @@ gchar *qq_get_icon_name(gint face)
 }
 
 /*
- * Hmm, this function is a bit weird.
- * 1. The pref "/plugins/prpl/qq/icon_dir" doesn't exist
- * 2. QQ_BUDDY_ICON_DIR is set in Makefile.am, but it's set to a
- *    directory that doesn't exist
- * 3. Why would the icon path be different for Windows and Linux?
- * 4. Why do we use this in the first place?  Setting your icon
- *    should go through the account editor.
+ * This function seems to let people set their buddy icon, but it restricts
+ * them to using a small list of stock icons.  Wouldn't it make more sense
+ * to use libpurple's normal icon setting stuff?
+ *
+ * Also it would be nice to unify the icon_dir code for Windows and Linux.
  */
 gchar *qq_get_icon_path(gchar *icon_name)
 {
@@ -551,6 +549,13 @@ gchar *qq_get_icon_path(gchar *icon_name
 	}
 #endif
 
+	/*
+	 * TODO: The QQ protocol plugin should probably call
+	 *       purple_prefs_add_string() at startup to initialize this
+	 *       preference.  It is used to allow users or distributions
+	 *       to specify this directory.  We don't include these icons
+	 *       with libpurple because of possible copyright concerns.
+	 */
 	icon_dir = purple_prefs_get_string("/plugins/prpl/qq/icon_dir");
 	if ( icon_dir == NULL || strlen(icon_dir) == 0) {
 #ifdef _WIN32


More information about the Commits mailing list