diff libpurple/protocols/silc/silcpurple.h @ 17573:9a96d8711303

We now depend on SILC Toolkit 1.1 for this copy of this prpl so we can lose a whole bunch of "#ifdef SILC_ATTRIBUTE_USER_ICON" and "#ifdef HAVE_SILCMIME_H" because they will always be true
author Stu Tomlinson <stu@nosnilmot.com>
date Sun, 10 Jun 2007 01:54:40 +0000
parents 980a104267da
children 6b02dba5bf41
line wrap: on
line diff
--- a/libpurple/protocols/silc/silcpurple.h	Sat Jun 09 18:03:12 2007 +0000
+++ b/libpurple/protocols/silc/silcpurple.h	Sun Jun 10 01:54:40 2007 +0000
@@ -77,9 +77,7 @@
 
 	char *motd;
 	PurpleRoomlist *roomlist;
-#ifdef HAVE_SILCMIME_H
 	SilcMimeAssembler mimeass;
-#endif
 	unsigned int detaching            : 1;
 	unsigned int resuming             : 1;
 	unsigned int roomlist_canceled    : 1;
@@ -148,13 +146,9 @@
 void silcpurple_parse_attrs(SilcDList attrs, char **moodstr, char **statusstr,
 					 char **contactstr, char **langstr, char **devicestr,
 					 char **tzstr, char **geostr);
-#ifdef SILC_ATTRIBUTE_USER_ICON
 void silcpurple_buddy_set_icon(PurpleConnection *gc, PurpleStoredImage *img);
-#endif
-#ifdef HAVE_SILCMIME_H
 char *silcpurple_file2mime(const char *filename);
 SilcDList silcpurple_image_message(const char *msg, SilcUInt32 *mflags);
-#endif
 
 #ifdef _WIN32
 typedef int uid_t;