Menu
▾
▴
[Ayttm-commits] CVS: ayttm/modules/smileys giles_smiles.c, 1.2, 1.3 smiley-themer.c, 1.17, 1.18 smileysc.c, 1.2, 1.3
|
From: Piotr S. <ps...@us...> - 2009-09-17 12:05:41
|
Update of /cvsroot/ayttm/ayttm/modules/smileys In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv12682/modules/smileys Modified Files: giles_smiles.c smiley-themer.c smileysc.c Log Message: reformatted source code Index: giles_smiles.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/smileys/giles_smiles.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- giles_smiles.c 27 Jul 2009 16:42:04 -0000 1.2 +++ giles_smiles.c 17 Sep 2009 12:04:59 -0000 1.3 @@ -36,20 +36,18 @@ ******************************************************************************/ /* Module defines */ #ifndef USE_POSIX_DLOPEN - #define plugin_info giles_smiles_LTX_plugin_info - #define module_version giles_smiles_LTX_module_version +#define plugin_info giles_smiles_LTX_plugin_info +#define module_version giles_smiles_LTX_module_version #endif - /* Function Prototypes */ static void init_alt_smileys(void); static void enable_smileys(ebmCallbackData *data); static int plugin_init(); static int plugin_finish(); -static int ref_count=0; -static LList *my_smileys=NULL; - +static int ref_count = 0; +static LList *my_smileys = NULL; /* Module Exports */ PLUGIN_INFO plugin_info = { @@ -63,25 +61,33 @@ plugin_finish, NULL }; + /* End Module Exports */ static void *smiley_tag = NULL; -unsigned int module_version() {return CORE_VERSION;} +unsigned int module_version() +{ + return CORE_VERSION; +} + static int plugin_init() { - eb_debug(DBG_MOD,"giles Smilies init\n"); + eb_debug(DBG_MOD, "giles Smilies init\n"); - if(!my_smileys) + if (!my_smileys) init_alt_smileys(); - - smiley_tag=eb_add_menu_item("Giles Smilies", EB_IMPORT_MENU, enable_smileys, ebmIMPORTDATA, NULL); - if(!smiley_tag) { - eb_debug(DBG_MOD,"Error! Unable to add Giles Smiley menu to import menu\n"); + + smiley_tag = + eb_add_menu_item("Giles Smilies", EB_IMPORT_MENU, + enable_smileys, ebmIMPORTDATA, NULL); + if (!smiley_tag) { + eb_debug(DBG_MOD, + "Error! Unable to add Giles Smiley menu to import menu\n"); return -1; } - ay_add_smiley_set( plugin_info.module_name, my_smileys ); + ay_add_smiley_set(plugin_info.module_name, my_smileys); return 0; } @@ -89,10 +95,10 @@ static int plugin_finish() { int result = 0; - - ay_remove_smiley_set( plugin_info.module_name ); - if(smiley_tag) + ay_remove_smiley_set(plugin_info.module_name); + + if (smiley_tag) result = eb_remove_menu_item(EB_IMPORT_MENU, smiley_tag); /* @@ -100,18 +106,19 @@ * default to avoid references to freed memory * otherwise, leave it as it is */ - if(smileys == my_smileys) + if (smileys == my_smileys) smileys = eb_smileys(); l_list_free(my_smileys); - my_smileys=NULL; + my_smileys = NULL; - if(smiley_tag && result) { - g_warning("Unable to remove Giles Smiley menu item from import menu!"); + if (smiley_tag && result) { + g_warning + ("Unable to remove Giles Smiley menu item from import menu!"); return -1; } - smiley_tag=NULL; + smiley_tag = NULL; return 0; } @@ -136,20 +143,20 @@ static void init_alt_smileys() { - my_smileys=add_smiley(my_smileys, "dead", dead20_xpm); - my_smileys=add_smiley(my_smileys, "blank", embarrased20_xpm); - my_smileys=add_smiley(my_smileys, "blush", embarrased20_xpm); - my_smileys=add_smiley(my_smileys, "grin", grin20_xpm); - my_smileys=add_smiley(my_smileys, "worried", indifferent20_xpm); - my_smileys=add_smiley(my_smileys, "lovey", kiss20_xpm); - my_smileys=add_smiley(my_smileys, "quiet", quiet20_xpm); - my_smileys=add_smiley(my_smileys, "sad", sad20_xpm); - my_smileys=add_smiley(my_smileys, "cooldude", shades20_xpm); - my_smileys=add_smiley(my_smileys, "oh", shocked20_xpm); - my_smileys=add_smiley(my_smileys, "smile", smile20_xpm); - my_smileys=add_smiley(my_smileys, "sob", tears20_xpm); - my_smileys=add_smiley(my_smileys, "tongue", tongue20_xpm); - my_smileys=add_smiley(my_smileys, "wink", wink20_xpm); + my_smileys = add_smiley(my_smileys, "dead", dead20_xpm); + my_smileys = add_smiley(my_smileys, "blank", embarrased20_xpm); + my_smileys = add_smiley(my_smileys, "blush", embarrased20_xpm); + my_smileys = add_smiley(my_smileys, "grin", grin20_xpm); + my_smileys = add_smiley(my_smileys, "worried", indifferent20_xpm); + my_smileys = add_smiley(my_smileys, "lovey", kiss20_xpm); + my_smileys = add_smiley(my_smileys, "quiet", quiet20_xpm); + my_smileys = add_smiley(my_smileys, "sad", sad20_xpm); + my_smileys = add_smiley(my_smileys, "cooldude", shades20_xpm); + my_smileys = add_smiley(my_smileys, "oh", shocked20_xpm); + my_smileys = add_smiley(my_smileys, "smile", smile20_xpm); + my_smileys = add_smiley(my_smileys, "sob", tears20_xpm); + my_smileys = add_smiley(my_smileys, "tongue", tongue20_xpm); + my_smileys = add_smiley(my_smileys, "wink", wink20_xpm); } static void reset_smileys(ebmCallbackData *data) @@ -158,17 +165,20 @@ smileys = eb_smileys(); eb_remove_menu_item(EB_IMPORT_MENU, smiley_tag); - smiley_tag=eb_add_menu_item("Giles Smilies", EB_IMPORT_MENU, enable_smileys, ebmIMPORTDATA, NULL); + smiley_tag = + eb_add_menu_item("Giles Smilies", EB_IMPORT_MENU, + enable_smileys, ebmIMPORTDATA, NULL); } static void enable_smileys(ebmCallbackData *data) { - if(!my_smileys) + if (!my_smileys) return; smileys = my_smileys; eb_remove_menu_item(EB_IMPORT_MENU, smiley_tag); - smiley_tag=eb_add_menu_item("Default Smilies", EB_IMPORT_MENU, reset_smileys, ebmIMPORTDATA, NULL); + smiley_tag = + eb_add_menu_item("Default Smilies", EB_IMPORT_MENU, + reset_smileys, ebmIMPORTDATA, NULL); } - Index: smiley-themer.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/smileys/smiley-themer.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- smiley-themer.c 27 Jul 2009 16:42:04 -0000 1.17 +++ smiley-themer.c 17 Sep 2009 12:04:59 -0000 1.18 @@ -41,34 +41,31 @@ #include <noX/xpm.h> #endif - /******************************************************************************* * Begin Module Code ******************************************************************************/ /* Module defines */ #ifndef USE_POSIX_DLOPEN - #define plugin_info smiley_themer_LTX_plugin_info - #define module_version smiley_themer_LTX_module_version +#define plugin_info smiley_themer_LTX_plugin_info +#define module_version smiley_themer_LTX_module_version #endif - static int plugin_init(); static int plugin_finish(); static int reload_prefs(); -static int is_setting_state=1; -static int ref_count=0; -static char smiley_directory[MAX_PREF_LEN]=AYTTM_SMILEY_DIR; -static char last_selected[MAX_PREF_LEN]=""; +static int is_setting_state = 1; +static int ref_count = 0; +static char smiley_directory[MAX_PREF_LEN] = AYTTM_SMILEY_DIR; +static char last_selected[MAX_PREF_LEN] = ""; static int do_smiley_debug = 0; -static char rcfilename[]="aysmile.rc"; +static char rcfilename[] = "aysmile.rc"; #ifndef FREE # define FREE(x) if(x){free(x); x=NULL;} #endif - /* Module Exports */ PLUGIN_INFO plugin_info = { PLUGIN_SMILEY, @@ -82,9 +79,13 @@ reload_prefs, NULL }; + /* End Module Exports */ -unsigned int module_version() {return CORE_VERSION;} +unsigned int module_version() +{ + return CORE_VERSION; +} static void load_themes(); static void unload_themes(); @@ -95,7 +96,7 @@ { input_list *il; - if(!smiley_directory[0]) + if (!smiley_directory[0]) return -1; il = g_new0(input_list, 1); @@ -103,21 +104,21 @@ plugin_info.prefs = il; il->widget.entry.value = smiley_directory; il->name = "smiley_directory"; - il->label= _("Smiley Directory:"); + il->label = _("Smiley Directory:"); il->type = EB_INPUT_ENTRY; il->next = g_new0(input_list, 1); il = il->next; il->widget.entry.value = last_selected; il->name = "last_selected"; - il->label= _("Last Selected:"); + il->label = _("Last Selected:"); il->type = EB_INPUT_ENTRY; il->next = g_new0(input_list, 1); il = il->next; il->widget.checkbox.value = &do_smiley_debug; il->name = "do_smiley_debug"; - il->label= _("Enable debugging"); + il->label = _("Enable debugging"); il->type = EB_INPUT_CHECKBOX; load_themes(); @@ -127,7 +128,7 @@ static int plugin_finish() { - while(plugin_info.prefs) { + while (plugin_info.prefs) { input_list *il = plugin_info.prefs->next; g_free(plugin_info.prefs); plugin_info.prefs = il; @@ -140,7 +141,7 @@ static int reload_prefs() { - is_setting_state=0; + is_setting_state = 0; unload_themes(); load_themes(); activate_theme_by_name(last_selected); @@ -151,9 +152,9 @@ * End Module Code ******************************************************************************/ -static int smiley_log(char *fmt,...) +static int smiley_log(char *fmt, ...) { - if(do_smiley_debug) { + if (do_smiley_debug) { va_list ap; va_start(ap, fmt); @@ -183,31 +184,32 @@ int core; }; -static LList *themes=NULL; +static LList *themes = NULL; -static void unload_theme(struct smiley_theme * theme) +static void unload_theme(struct smiley_theme *theme) { - if(theme->core) { + if (theme->core) { ay_remove_smiley_set(theme->name); - if(theme->menu_tag) + if (theme->menu_tag) eb_remove_menu_item(EB_SMILEY_MENU, theme->menu_tag); return; } - if(smileys == theme->smileys) + if (smileys == theme->smileys) smileys = eb_smileys(); - if(theme->name) + if (theme->name) ay_remove_smiley_set(theme->name); - if(theme->menu_tag) + if (theme->menu_tag) eb_remove_menu_item(EB_SMILEY_MENU, theme->menu_tag); - while(theme->smileys) { + while (theme->smileys) { struct smiley_struct *smiley = theme->smileys->data; XpmFree(smiley->pixmap); FREE(smiley->service); FREE(smiley); - theme->smileys = l_list_remove_link(theme->smileys, theme->smileys); + theme->smileys = + l_list_remove_link(theme->smileys, theme->smileys); } FREE(theme->name); @@ -221,14 +223,14 @@ static void unload_themes() { - while(themes) { + while (themes) { struct smiley_theme *theme = themes->data; unload_theme(theme); themes = l_list_remove_link(themes, themes); } } -static int smiley_readline(char *ptr, int maxlen, FILE * fp) +static int smiley_readline(char *ptr, int maxlen, FILE *fp) { int n; int c; @@ -237,8 +239,8 @@ c = fgetc(fp); - if(c!=EOF) { - if(c == '\r') /* get rid of \r */ + if (c != EOF) { + if (c == '\r') /* get rid of \r */ continue; *ptr = (char)c; if (c == '\n') @@ -246,9 +248,9 @@ ptr++; } else { if (n == 1) - return (0); /* EOF, no data */ + return (0); /* EOF, no data */ else - break; /* EOF, w/ data */ + break; /* EOF, w/ data */ } } @@ -260,108 +262,109 @@ { char *tmp; - if(!buff[0] || buff[0] == '#') + if (!buff[0] || buff[0] == '#') return 0; - if(strchr(buff, '=') <= buff) + if (strchr(buff, '=') <= buff) return 0; /* remove leading spaces */ - for(; *buff && isspace(*buff); buff++) - ; + for (; *buff && isspace(*buff); buff++) ; - if(!*buff) /* empty key */ + if (!*buff) /* empty key */ return 0; *key = buff; *value = strchr(buff, '='); - **value='\0'; + **value = '\0'; /* remove trailing spaces */ - for(tmp=buff; *tmp && !isspace(*tmp); tmp++) - ; - if(*tmp) - *tmp='\0'; + for (tmp = buff; *tmp && !isspace(*tmp); tmp++) ; + if (*tmp) + *tmp = '\0'; - buff = (*value)+1; + buff = (*value) + 1; /* remove leading spaces of value */ - for(; *buff && isspace(*buff); buff++) - ; + for (; *buff && isspace(*buff); buff++) ; - if(!*buff) /* empty value */ + if (!*buff) /* empty value */ return 0; *value = buff; /* remove trailing spaces */ - for(tmp=buff+strlen(buff)-1; tmp >= buff && isspace(*tmp); tmp--) - *tmp='\0'; + for (tmp = buff + strlen(buff) - 1; tmp >= buff && isspace(*tmp); tmp--) + *tmp = '\0'; return 1; } -static struct smiley_theme * load_theme(const char *theme_name) +static struct smiley_theme *load_theme(const char *theme_name) { FILE *themerc; char buff[1024]; struct smiley_theme *theme; - char *curr_protocol=NULL; + char *curr_protocol = NULL; snprintf(buff, sizeof(buff), "%s/%s/%s", - smiley_directory, theme_name, rcfilename); + smiley_directory, theme_name, rcfilename); - if(!(themerc = fopen(buff, "rt"))) { - LOG(("Could not find/open %s error %d: %s", rcfilename, errno, strerror(errno))); + if (!(themerc = fopen(buff, "rt"))) { + LOG(("Could not find/open %s error %d: %s", rcfilename, errno, + strerror(errno))); return NULL; } theme = calloc(1, sizeof(struct smiley_theme)); - while((smiley_readline(buff, sizeof(buff), themerc))>0) { + while ((smiley_readline(buff, sizeof(buff), themerc)) > 0) { const char **smiley_data; char filepath[1024]; char *key, *value; - if(!splitline(buff, &key, &value)) + if (!splitline(buff, &key, &value)) continue; - if(key[0] == '%') { + if (key[0] == '%') { key++; - if(!strcmp(key, "name")) + if (!strcmp(key, "name")) theme->name = strdup(value); - else if(!strcmp(key, "desc")) + else if (!strcmp(key, "desc")) theme->description = strdup(value); - else if(!strcmp(key, "author")) + else if (!strcmp(key, "author")) theme->author = strdup(value); - else if(!strcmp(key, "date")) + else if (!strcmp(key, "date")) theme->date = strdup(value); - else if(!strcmp(key, "revision")) + else if (!strcmp(key, "revision")) theme->revision = strdup(value); - else if(!strcmp(key, "protocol")) { + else if (!strcmp(key, "protocol")) { FREE(curr_protocol); curr_protocol = strdup(value); } } else { snprintf(filepath, sizeof(filepath), "%s/%s/%s", - smiley_directory, theme_name, value); + smiley_directory, theme_name, value); - if(XpmReadFileToData(filepath, &smiley_data) != XpmSuccess) { + if (XpmReadFileToData(filepath, + &smiley_data) != XpmSuccess) { LOG(("Could not read xpm file %s", filepath)); continue; } - theme->smileys = add_smiley(theme->smileys, key, smiley_data, curr_protocol); + theme->smileys = + add_smiley(theme->smileys, key, smiley_data, + curr_protocol); } } - + fclose(themerc); - if(!theme->smileys) { + if (!theme->smileys) { unload_theme(theme); return NULL; } - if(!theme->name) + if (!theme->name) theme->name = strdup(theme_name); return theme; @@ -371,7 +374,7 @@ { struct smiley_theme *theme = (struct smiley_theme *)data; - if(is_setting_state || !theme || !theme->smileys) + if (is_setting_state || !theme || !theme->smileys) return; is_setting_state = 1; @@ -379,7 +382,7 @@ eb_activate_menu_item(EB_SMILEY_MENU, theme->menu_tag); - strncpy(last_selected, theme->name, sizeof(last_selected)-1); + strncpy(last_selected, theme->name, sizeof(last_selected) - 1); is_setting_state = 0; } @@ -388,42 +391,48 @@ struct smiley_theme *theme; struct dirent *entry; DIR *theme_dir = opendir(smiley_directory); - if(!theme_dir) { + if (!theme_dir) { LOG(("Unable to open smiley directory %s", smiley_directory)); return; } - LOG(("Opened smileydirectory %s\n",smiley_directory)); - + LOG(("Opened smileydirectory %s\n", smiley_directory)); + theme = calloc(1, sizeof(struct smiley_theme)); theme->name = _("Default"); theme->smileys = eb_smileys(); theme->core = 1; - theme->menu_tag=eb_add_menu_item(theme->name, EB_SMILEY_MENU, enable_smileys, ebmSMILEYDATA, theme); - if(!theme->menu_tag) { - eb_debug(DBG_MOD,"Error! Unable to add Smiley menu to smiley menu\n"); + theme->menu_tag = + eb_add_menu_item(theme->name, EB_SMILEY_MENU, enable_smileys, + ebmSMILEYDATA, theme); + if (!theme->menu_tag) { + eb_debug(DBG_MOD, + "Error! Unable to add Smiley menu to smiley menu\n"); free(theme); } else themes = l_list_prepend(themes, theme); - while((entry=readdir(theme_dir))) { - if(entry->d_name[0]=='.') + while ((entry = readdir(theme_dir))) { + if (entry->d_name[0] == '.') continue; - if(!(theme = load_theme(entry->d_name))) { + if (!(theme = load_theme(entry->d_name))) { LOG(("Could not load theme %s", entry->d_name)); continue; } - theme->menu_tag=eb_add_menu_item(theme->name, EB_SMILEY_MENU, enable_smileys, ebmSMILEYDATA, theme); - if(!theme->menu_tag) { - eb_debug(DBG_MOD,"Error! Unable to add Smiley menu to smiley menu\n"); + theme->menu_tag = + eb_add_menu_item(theme->name, EB_SMILEY_MENU, + enable_smileys, ebmSMILEYDATA, theme); + if (!theme->menu_tag) { + eb_debug(DBG_MOD, + "Error! Unable to add Smiley menu to smiley menu\n"); unload_theme(theme); continue; } - ay_add_smiley_set( theme->name, theme->smileys ); + ay_add_smiley_set(theme->name, theme->smileys); themes = l_list_prepend(themes, theme); } @@ -433,13 +442,12 @@ static void activate_theme_by_name(const char *name) { - LList * l; - for(l=themes; l; l=l_list_next(l)) { + LList *l; + for (l = themes; l; l = l_list_next(l)) { struct smiley_theme *theme = l->data; - if(!strcmp(theme->name, name)) { + if (!strcmp(theme->name, name)) { enable_smileys((ebmCallbackData *)theme); return; } } } - Index: smileysc.c =================================================================== RCS file: /cvsroot/ayttm/ayttm/modules/smileys/smileysc.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- smileysc.c 27 Jul 2009 16:42:04 -0000 1.2 +++ smileysc.c 17 Sep 2009 12:04:59 -0000 1.3 @@ -34,20 +34,18 @@ ******************************************************************************/ /* Module defines */ #ifndef USE_POSIX_DLOPEN - #define plugin_info smileysc_LTX_plugin_info - #define module_version smileysc_LTX_module_version +#define plugin_info smileysc_LTX_plugin_info +#define module_version smileysc_LTX_module_version #endif - /* Function Prototypes */ static void init_alt_smileys(void); static void enable_smileys(ebmCallbackData *data); static int plugin_init(); static int plugin_finish(); -static int ref_count=0; -static LList *my_smileys=NULL; - +static int ref_count = 0; +static LList *my_smileys = NULL; /* Module Exports */ PLUGIN_INFO plugin_info = { @@ -61,55 +59,63 @@ plugin_finish, NULL }; + /* End Module Exports */ static void *smiley_tag = NULL; -unsigned int module_version() {return CORE_VERSION;} +unsigned int module_version() +{ + return CORE_VERSION; +} static int plugin_init() { - eb_debug(DBG_MOD,"console smileys init\n"); + eb_debug(DBG_MOD, "console smileys init\n"); - if(!my_smileys) + if (!my_smileys) init_alt_smileys(); - - smiley_tag=eb_add_menu_item("Console Smilies", EB_IMPORT_MENU, enable_smileys, ebmIMPORTDATA, NULL); - if(!smiley_tag) { - eb_debug(DBG_MOD,"Error! Unable to add Console Smiley menu to import menu\n"); + + smiley_tag = + eb_add_menu_item("Console Smilies", EB_IMPORT_MENU, + enable_smileys, ebmIMPORTDATA, NULL); + if (!smiley_tag) { + eb_debug(DBG_MOD, + "Error! Unable to add Console Smiley menu to import menu\n"); return -1; } - ay_add_smiley_set( plugin_info.module_name, my_smileys ); - + ay_add_smiley_set(plugin_info.module_name, my_smileys); + return 0; } static int plugin_finish() { int result = 0; - - ay_remove_smiley_set( plugin_info.module_name ); - if(smiley_tag) + ay_remove_smiley_set(plugin_info.module_name); + + if (smiley_tag) result = eb_remove_menu_item(EB_IMPORT_MENU, smiley_tag); /* * if we're using these smileys, then reset to * default to avoid references to freed memory * otherwise, leave it as it is */ - if(smileys == my_smileys) + if (smileys == my_smileys) smileys = eb_smileys(); l_list_free(my_smileys); - my_smileys=NULL; + my_smileys = NULL; - if(smiley_tag && result) { - g_warning("Unable to remove Console Smiley menu item from import menu!"); + if (smiley_tag && result) { + g_warning + ("Unable to remove Console Smiley menu item from import menu!"); return -1; } - smiley_tag=NULL; + smiley_tag = NULL; return 0; } @@ -136,23 +142,23 @@ static void init_alt_smileys() { - my_smileys=add_smiley(my_smileys, "smile", smile_xpm); - my_smileys=add_smiley(my_smileys, "sad", sad_xpm); - my_smileys=add_smiley(my_smileys, "wink", wink_xpm); - my_smileys=add_smiley(my_smileys, "laugh", laugh_xpm); - my_smileys=add_smiley(my_smileys, "cry", sob_xpm); - my_smileys=add_smiley(my_smileys, "biglaugh", laugh_xpm); - my_smileys=add_smiley(my_smileys, "tongue", tongue_xpm); - my_smileys=add_smiley(my_smileys, "cooldude", cooldude_xpm); - my_smileys=add_smiley(my_smileys, "worried", worried_xpm); - my_smileys=add_smiley(my_smileys, "grin", grin_xpm); - my_smileys=add_smiley(my_smileys, "blank", blank_xpm); - my_smileys=add_smiley(my_smileys, "oh", oh_xpm); - my_smileys=add_smiley(my_smileys, "confused", confused_xpm); - my_smileys=add_smiley(my_smileys, "lovey", kiss_xpm); - my_smileys=add_smiley(my_smileys, "kiss", kiss_xpm); - my_smileys=add_smiley(my_smileys, "heyy", heyy_xpm); - my_smileys=add_smiley(my_smileys, "blush", blush_xpm); + my_smileys = add_smiley(my_smileys, "smile", smile_xpm); + my_smileys = add_smiley(my_smileys, "sad", sad_xpm); + my_smileys = add_smiley(my_smileys, "wink", wink_xpm); + my_smileys = add_smiley(my_smileys, "laugh", laugh_xpm); + my_smileys = add_smiley(my_smileys, "cry", sob_xpm); + my_smileys = add_smiley(my_smileys, "biglaugh", laugh_xpm); + my_smileys = add_smiley(my_smileys, "tongue", tongue_xpm); + my_smileys = add_smiley(my_smileys, "cooldude", cooldude_xpm); + my_smileys = add_smiley(my_smileys, "worried", worried_xpm); + my_smileys = add_smiley(my_smileys, "grin", grin_xpm); + my_smileys = add_smiley(my_smileys, "blank", blank_xpm); + my_smileys = add_smiley(my_smileys, "oh", oh_xpm); + my_smileys = add_smiley(my_smileys, "confused", confused_xpm); + my_smileys = add_smiley(my_smileys, "lovey", kiss_xpm); + my_smileys = add_smiley(my_smileys, "kiss", kiss_xpm); + my_smileys = add_smiley(my_smileys, "heyy", heyy_xpm); + my_smileys = add_smiley(my_smileys, "blush", blush_xpm); } static void reset_smileys(ebmCallbackData *data) @@ -161,17 +167,20 @@ smileys = eb_smileys(); eb_remove_menu_item(EB_IMPORT_MENU, smiley_tag); - smiley_tag=eb_add_menu_item("Console Smilies", EB_IMPORT_MENU, enable_smileys, ebmIMPORTDATA, NULL); + smiley_tag = + eb_add_menu_item("Console Smilies", EB_IMPORT_MENU, + enable_smileys, ebmIMPORTDATA, NULL); } static void enable_smileys(ebmCallbackData *data) { - if(!my_smileys) + if (!my_smileys) return; smileys = my_smileys; eb_remove_menu_item(EB_IMPORT_MENU, smiley_tag); - smiley_tag=eb_add_menu_item("Default Smilies", EB_IMPORT_MENU, reset_smileys, ebmIMPORTDATA, NULL); + smiley_tag = + eb_add_menu_item("Default Smilies", EB_IMPORT_MENU, + reset_smileys, ebmIMPORTDATA, NULL); } - |