comparison: pidgin/gtkmain.c
pidgin/gtkmain.c
- branch
- next.major
- changeset 31992
- 7b7a143ddfaf
- parent 31590
- e96aac3d0c77
- parent 31889
- 96183796df0c
- child 32433
- f539a2c083b2
- child 32785
- 5e08d5a41442
equal
deleted
inserted
replaced
| 31868:b1dbae4ba9a8 | 31992:7b7a143ddfaf |
|---|---|
| 268 | 268 |
| 269 #ifndef _WIN32 | 269 #ifndef _WIN32 |
| 270 /* use the nice PNG icon for all the windows */ | 270 /* use the nice PNG icon for all the windows */ |
| 271 for(i=0; i<G_N_ELEMENTS(icon_sizes); i++) { | 271 for(i=0; i<G_N_ELEMENTS(icon_sizes); i++) { |
| 272 icon_path = g_build_filename(DATADIR, "icons", "hicolor", icon_sizes[i].dir, "apps", icon_sizes[i].filename, NULL); | 272 icon_path = g_build_filename(DATADIR, "icons", "hicolor", icon_sizes[i].dir, "apps", icon_sizes[i].filename, NULL); |
| 273 icon = gdk_pixbuf_new_from_file(icon_path, NULL); | 273 icon = pidgin_pixbuf_new_from_file(icon_path); |
| 274 g_free(icon_path); | 274 g_free(icon_path); |
| 275 if (icon) { | 275 if (icon) { |
| 276 icons = g_list_append(icons,icon); | 276 icons = g_list_append(icons,icon); |
| 277 } else { | 277 } else { |
| 278 purple_debug_error("ui_main", | 278 purple_debug_error("ui_main", |
| 379 /* | 379 /* |
| 380 * This is the client key for "Pidgin." It is owned by the AIM | 380 * This is the client key for "Pidgin." It is owned by the AIM |
| 381 * account "markdoliner." Please don't use this key for other | 381 * account "markdoliner." Please don't use this key for other |
| 382 * applications. You can either not specify a client key, in | 382 * applications. You can either not specify a client key, in |
| 383 * which case the default "libpurple" key will be used, or you | 383 * which case the default "libpurple" key will be used, or you |
| 384 * can register for your own client key at | 384 * can try to register your own at the AIM or ICQ web sites |
| 385 * http://developer.aim.com/manageKeys.jsp | 385 * (although this functionality was removed at some point, it's |
| 386 * possible it has been re-added). AOL's old key management | |
| 387 * page is http://developer.aim.com/manageKeys.jsp | |
| 386 */ | 388 */ |
| 387 g_hash_table_insert(ui_info, "prpl-aim-clientkey", "ma1cSASNCKFtrdv9"); | 389 g_hash_table_insert(ui_info, "prpl-aim-clientkey", "ma1cSASNCKFtrdv9"); |
| 388 g_hash_table_insert(ui_info, "prpl-icq-clientkey", "ma1cSASNCKFtrdv9"); | 390 g_hash_table_insert(ui_info, "prpl-icq-clientkey", "ma1cSASNCKFtrdv9"); |
| 389 | 391 |
| 390 /* | 392 /* |
