[opengaim-changes] opengaim/src dnd-hints.c,1.1.1.2,1.2 gtkblist.c,1.8,1.9 gtksound.c,1.1.1.8,1.2 gt
Status: Inactive
Brought to you by:
tvierling
Menu
▾
▴
[opengaim-changes] opengaim/src dnd-hints.c,1.1.1.2,1.2 gtkblist.c,1.8,1.9 gtksound.c,1.1.1.8,1.2 gtkutils.c,1.1.1.13,1.2 main.c,1.6,1.7 stock.c,1.3,1.4 themes.c,1.1.1.6,1.2
|
From: Todd V. <tvi...@us...> - 2004-04-19 14:32:53
|
Update of /cvsroot/opengaim/opengaim/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24352/src Modified Files: dnd-hints.c gtkblist.c gtksound.c gtkutils.c main.c stock.c themes.c Log Message: gaim -> opengaim Index: gtksound.c =================================================================== RCS file: /cvsroot/opengaim/opengaim/src/gtksound.c,v retrieving revision 1.1.1.8 retrieving revision 1.2 diff -C2 -d -r1.1.1.8 -r1.2 *** gtksound.c 22 Mar 2004 23:59:07 -0000 1.1.1.8 --- gtksound.c 19 Apr 2004 14:32:43 -0000 1.2 *************** *** 292,296 **** if(!filename || !strlen(filename)) { if(filename) g_free(filename); ! filename = g_build_filename(DATADIR, "sounds", "gaim", sounds[event].def, NULL); } --- 292,296 ---- if(!filename || !strlen(filename)) { if(filename) g_free(filename); ! filename = g_build_filename(DATADIR, "sounds", "opengaim", sounds[event].def, NULL); } Index: stock.c =================================================================== RCS file: /cvsroot/opengaim/opengaim/src/stock.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** stock.c 2 Apr 2004 14:38:01 -0000 1.3 --- stock.c 19 Apr 2004 14:32:43 -0000 1.4 *************** *** 65,69 **** { GAIM_STOCK_INVITE, NULL, GTK_STOCK_JUMP_TO }, { GAIM_STOCK_LINK, "buttons", "insert-link-small.png" }, ! { GAIM_STOCK_LOGO, "gaim", "logo.png" }, { GAIM_STOCK_MODIFY, NULL, GTK_STOCK_PREFERENCES }, { GAIM_STOCK_PAUSE, "buttons", "pause.png" }, --- 65,69 ---- { GAIM_STOCK_INVITE, NULL, GTK_STOCK_JUMP_TO }, { GAIM_STOCK_LINK, "buttons", "insert-link-small.png" }, ! { GAIM_STOCK_LOGO, "opengaim","logo.png" }, { GAIM_STOCK_MODIFY, NULL, GTK_STOCK_PREFERENCES }, { GAIM_STOCK_PAUSE, "buttons", "pause.png" }, *************** *** 76,81 **** { GAIM_STOCK_TEXT_NORMAL, "buttons", "text_normal.png" }, { GAIM_STOCK_TEXT_SMALLER, "buttons", "text_smaller.png" }, ! { GAIM_STOCK_TYPED, "gaim", "typed.png" }, ! { GAIM_STOCK_TYPING, "gaim", "typing.png" }, { GAIM_STOCK_UPLOAD, NULL, GTK_STOCK_GO_UP }, { GAIM_STOCK_WARN, NULL, GTK_STOCK_DIALOG_WARNING } --- 76,81 ---- { GAIM_STOCK_TEXT_NORMAL, "buttons", "text_normal.png" }, { GAIM_STOCK_TEXT_SMALLER, "buttons", "text_smaller.png" }, ! { GAIM_STOCK_TYPED, "opengaim","typed.png" }, ! { GAIM_STOCK_TYPING, "opengaim","typing.png" }, { GAIM_STOCK_UPLOAD, NULL, GTK_STOCK_GO_UP }, { GAIM_STOCK_WARN, NULL, GTK_STOCK_DIALOG_WARNING } *************** *** 105,112 **** return NULL; ! if (!strcmp(dir, "gaim")) ! filename = g_build_filename(DATADIR, "pixmaps", "gaim", base, NULL); else ! filename = g_build_filename(DATADIR, "pixmaps", "gaim", dir, base, NULL); if (!g_file_test(filename, G_FILE_TEST_EXISTS)) { --- 105,112 ---- return NULL; ! if (!strcmp(dir, "opengaim")) ! filename = g_build_filename(DATADIR, "pixmaps", "opengaim", base, NULL); else ! filename = g_build_filename(DATADIR, "pixmaps", "opengaim", dir, base, NULL); if (!g_file_test(filename, G_FILE_TEST_EXISTS)) { Index: gtkblist.c =================================================================== RCS file: /cvsroot/opengaim/opengaim/src/gtkblist.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** gtkblist.c 2 Apr 2004 14:38:00 -0000 1.8 --- gtkblist.c 19 Apr 2004 14:32:42 -0000 1.9 *************** *** 2502,2515 **** if(buddy && buddy->present == GAIM_BUDDY_SIGNING_ON) { ! filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", "login.png", NULL); } else if(buddy && buddy->present == GAIM_BUDDY_SIGNING_OFF) { ! filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", "logout.png", NULL); } else if(buddy || chat) { char *image = g_strdup_printf("%s.png", protoname); ! filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", image, NULL); g_free(image); } else { /* gaim dude */ ! filename = g_build_filename(DATADIR, "pixmaps", "gaim.png", NULL); } --- 2502,2515 ---- if(buddy && buddy->present == GAIM_BUDDY_SIGNING_ON) { ! filename = g_build_filename(DATADIR, "pixmaps", "opengaim", "status", "default", "login.png", NULL); } else if(buddy && buddy->present == GAIM_BUDDY_SIGNING_OFF) { ! filename = g_build_filename(DATADIR, "pixmaps", "opengaim", "status", "default", "logout.png", NULL); } else if(buddy || chat) { char *image = g_strdup_printf("%s.png", protoname); ! filename = g_build_filename(DATADIR, "pixmaps", "opengaim", "status", "default", image, NULL); g_free(image); } else { /* gaim dude */ ! filename = g_build_filename(DATADIR, "pixmaps", "opengaim", "gaim.png", NULL); } *************** *** 2528,2532 **** GdkPixbuf *emblem; char *image = g_strdup_printf("%s.png", emblems[i].filename); ! filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", image, NULL); g_free(image); emblem = gdk_pixbuf_new_from_file(filename, NULL); --- 2528,2532 ---- GdkPixbuf *emblem; char *image = g_strdup_printf("%s.png", emblems[i].filename); ! filename = g_build_filename(DATADIR, "pixmaps", "opengaim", "status", "default", image, NULL); g_free(image); emblem = gdk_pixbuf_new_from_file(filename, NULL); *************** *** 4450,4454 **** g_snprintf(buf, sizeof(buf), "%s.png", protoname); ! filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", buf, NULL); status = gdk_pixbuf_new_from_file(filename, NULL); --- 4450,4454 ---- g_snprintf(buf, sizeof(buf), "%s.png", protoname); ! filename = g_build_filename(DATADIR, "pixmaps", "opengaim", "status", "default", buf, NULL); status = gdk_pixbuf_new_from_file(filename, NULL); Index: gtkutils.c =================================================================== RCS file: /cvsroot/opengaim/opengaim/src/gtkutils.c,v retrieving revision 1.1.1.13 retrieving revision 1.2 diff -C2 -d -r1.1.1.13 -r1.2 *** gtkutils.c 2 Apr 2004 14:06:09 -0000 1.1.1.13 --- gtkutils.c 19 Apr 2004 14:32:43 -0000 1.2 *************** *** 690,694 **** g_snprintf(buf, sizeof(buf), "%s.png", proto_name); ! filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", buf, NULL); pixbuf = gdk_pixbuf_new_from_file(filename, NULL); --- 690,694 ---- g_snprintf(buf, sizeof(buf), "%s.png", proto_name); ! filename = g_build_filename(DATADIR, "pixmaps", "opengaim", "status", "default", buf, NULL); pixbuf = gdk_pixbuf_new_from_file(filename, NULL); *************** *** 826,830 **** g_snprintf(buf, sizeof(buf), "%s.png", proto_name); ! filename = g_build_filename(DATADIR, "pixmaps", "gaim", "status", "default", buf, NULL); pixbuf = gdk_pixbuf_new_from_file(filename, NULL); --- 826,830 ---- g_snprintf(buf, sizeof(buf), "%s.png", proto_name); ! filename = g_build_filename(DATADIR, "pixmaps", "opengaim", "status", "default", buf, NULL); pixbuf = gdk_pixbuf_new_from_file(filename, NULL); Index: dnd-hints.c =================================================================== RCS file: /cvsroot/opengaim/opengaim/src/dnd-hints.c,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -C2 -d -r1.1.1.2 -r1.2 *** dnd-hints.c 22 Mar 2004 23:58:58 -0000 1.1.1.2 --- dnd-hints.c 19 Apr 2004 14:32:42 -0000 1.2 *************** *** 119,123 **** gchar *fname; ! fname = g_build_filename(DATADIR, "pixmaps", "gaim", hint_windows[i].filename, NULL); --- 119,123 ---- gchar *fname; ! fname = g_build_filename(DATADIR, "pixmaps", "opengaim", hint_windows[i].filename, NULL); Index: main.c =================================================================== RCS file: /cvsroot/opengaim/opengaim/src/main.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** main.c 2 Apr 2004 14:38:01 -0000 1.6 --- main.c 19 Apr 2004 14:32:43 -0000 1.7 *************** *** 412,416 **** #ifndef _WIN32 /* use the nice PNG icon for all the windows */ ! icon_path = g_build_filename(DATADIR, "pixmaps", "gaim", "icons", "online.png", NULL); icon = gdk_pixbuf_new_from_file(icon_path, NULL); g_free(icon_path); --- 412,416 ---- #ifndef _WIN32 /* use the nice PNG icon for all the windows */ ! icon_path = g_build_filename(DATADIR, "pixmaps", "opengaim", "icons", "online.png", NULL); icon = gdk_pixbuf_new_from_file(icon_path, NULL); g_free(icon_path); Index: themes.c =================================================================== RCS file: /cvsroot/opengaim/opengaim/src/themes.c,v retrieving revision 1.1.1.6 retrieving revision 1.2 diff -C2 -d -r1.1.1.6 -r1.2 *** themes.c 22 Mar 2004 23:59:10 -0000 1.1.1.6 --- themes.c 19 Apr 2004 14:32:43 -0000 1.2 *************** *** 215,219 **** char* probedirs[3]; ! probedirs[0] = g_build_filename(DATADIR, "pixmaps", "gaim", "smileys", NULL); probedirs[1] = g_build_filename(gaim_user_dir(), "smileys", NULL); probedirs[2] = 0; --- 215,219 ---- char* probedirs[3]; ! probedirs[0] = g_build_filename(DATADIR, "pixmaps", "opengaim", "smileys", NULL); probedirs[1] = g_build_filename(gaim_user_dir(), "smileys", NULL); probedirs[2] = 0; |
