pidgin/libpidgin.c

changeset 35850
1abeda205d6c
parent 35794
973dff96780a
child 35989
2b5a26ddbb69
child 37136
cfa7c57f9ca5
equal deleted inserted replaced
35849:77efee65c5f4 35850:1abeda205d6c
221 pidgin_blist_setup_sort_methods(); 221 pidgin_blist_setup_sort_methods();
222 222
223 #ifndef _WIN32 223 #ifndef _WIN32
224 /* use the nice PNG icon for all the windows */ 224 /* use the nice PNG icon for all the windows */
225 for(i=0; i<G_N_ELEMENTS(icon_sizes); i++) { 225 for(i=0; i<G_N_ELEMENTS(icon_sizes); i++) {
226 icon_path = g_build_filename(DATADIR, "icons", "hicolor", icon_sizes[i].dir, "apps", icon_sizes[i].filename, NULL); 226 icon_path = g_build_filename(PURPLE_DATADIR, "icons", "hicolor",
227 icon_sizes[i].dir, "apps", icon_sizes[i].filename, NULL);
227 icon = pidgin_pixbuf_new_from_file(icon_path); 228 icon = pidgin_pixbuf_new_from_file(icon_path);
228 g_free(icon_path); 229 g_free(icon_path);
229 if (icon) { 230 if (icon) {
230 icons = g_list_append(icons,icon); 231 icons = g_list_append(icons,icon);
231 } else { 232 } else {
476 #else 477 #else
477 debug_enabled = FALSE; 478 debug_enabled = FALSE;
478 #endif 479 #endif
479 480
480 #ifdef ENABLE_NLS 481 #ifdef ENABLE_NLS
481 bindtextdomain(PACKAGE, LOCALEDIR); 482 bindtextdomain(PACKAGE, PURPLE_LOCALEDIR);
482 bind_textdomain_codeset(PACKAGE, "UTF-8"); 483 bind_textdomain_codeset(PACKAGE, "UTF-8");
483 textdomain(PACKAGE); 484 textdomain(PACKAGE);
484 #endif 485 #endif
485 486
486 #ifdef HAVE_SETLOCALE 487 #ifdef HAVE_SETLOCALE
748 search_path = g_build_filename(purple_user_dir(), "plugins", NULL); 749 search_path = g_build_filename(purple_user_dir(), "plugins", NULL);
749 if (!g_stat(search_path, &st)) 750 if (!g_stat(search_path, &st))
750 g_mkdir(search_path, S_IRUSR | S_IWUSR | S_IXUSR); 751 g_mkdir(search_path, S_IRUSR | S_IWUSR | S_IXUSR);
751 purple_plugins_add_search_path(search_path); 752 purple_plugins_add_search_path(search_path);
752 g_free(search_path); 753 g_free(search_path);
753 purple_plugins_add_search_path(LIBDIR); 754 purple_plugins_add_search_path(PIDGIN_LIBDIR);
754 755
755 if (!purple_core_init(PIDGIN_UI)) { 756 if (!purple_core_init(PIDGIN_UI)) {
756 fprintf(stderr, 757 fprintf(stderr,
757 "Initialization of the libpurple core failed. Dumping core.\n" 758 "Initialization of the libpurple core failed. Dumping core.\n"
758 "Please report this!\n"); 759 "Please report this!\n");

mercurial