Binary files xfdesktop/.git/index and xfdesktop-mine/.git/index differ diff -crb xfdesktop/.git/logs/HEAD xfdesktop-mine/.git/logs/HEAD *** xfdesktop/.git/logs/HEAD Fri Jul 2 15:42:47 2010 --- xfdesktop-mine/.git/logs/HEAD Fri Jul 2 15:04:10 2010 *************** *** 1 **** ! 0000000000000000000000000000000000000000 32784a81dd7c04285493915fde51fe23ed663305 dylix 1278099767 -0400 clone: from git://git.xfce.org/xfce/xfdesktop --- 1 ---- ! 0000000000000000000000000000000000000000 32784a81dd7c04285493915fde51fe23ed663305 dylix 1278097450 -0400 clone: from git://git.xfce.org/xfce/xfdesktop diff -crb xfdesktop/.git/logs/refs/heads/master xfdesktop-mine/.git/logs/refs/heads/master *** xfdesktop/.git/logs/refs/heads/master Fri Jul 2 15:42:47 2010 --- xfdesktop-mine/.git/logs/refs/heads/master Fri Jul 2 15:04:10 2010 *************** *** 1 **** ! 0000000000000000000000000000000000000000 32784a81dd7c04285493915fde51fe23ed663305 dylix 1278099767 -0400 clone: from git://git.xfce.org/xfce/xfdesktop --- 1 ---- ! 0000000000000000000000000000000000000000 32784a81dd7c04285493915fde51fe23ed663305 dylix 1278097450 -0400 clone: from git://git.xfce.org/xfce/xfdesktop Binary files xfdesktop/.git/objects/pack/pack-67f5b00704009b295a0e036ffb42073b61474bbc.idx and xfdesktop-mine/.git/objects/pack/pack-67f5b00704009b295a0e036ffb42073b61474bbc.idx differ Binary files xfdesktop/.git/objects/pack/pack-67f5b00704009b295a0e036ffb42073b61474bbc.pack and xfdesktop-mine/.git/objects/pack/pack-67f5b00704009b295a0e036ffb42073b61474bbc.pack differ Only in xfdesktop-mine: INSTALL Only in xfdesktop-mine: Makefile.in Only in xfdesktop-mine: aclocal.m4 Only in xfdesktop-mine/backdrops: Makefile.in Only in xfdesktop-mine/common: Makefile.in Only in xfdesktop-mine: config.guess Only in xfdesktop-mine: config.h.in Only in xfdesktop-mine: config.sub Only in xfdesktop-mine: configure Only in xfdesktop-mine: configure.ac Only in xfdesktop-mine: depcomp Only in xfdesktop-mine/doc/C: Makefile.in Only in xfdesktop-mine/doc/C/images: Makefile.in Only in xfdesktop-mine/doc: Makefile.in Only in xfdesktop-mine/doc/ca: Makefile.in Only in xfdesktop-mine/doc/ca/images: Makefile.in Only in xfdesktop-mine/doc/da: Makefile.in Only in xfdesktop-mine/doc/da/images: Makefile.in Only in xfdesktop-mine/doc/fr: Makefile.in Only in xfdesktop-mine/doc/fr/images: Makefile.in Only in xfdesktop-mine/doc/gl: Makefile.in Only in xfdesktop-mine/doc/gl/images: Makefile.in Only in xfdesktop-mine/doc/it: Makefile.in Only in xfdesktop-mine/doc/it/images: Makefile.in Only in xfdesktop-mine/doc/ja: Makefile.in Only in xfdesktop-mine/doc/ja/images: Makefile.in Only in xfdesktop-mine: install-sh Only in xfdesktop-mine: intltool-extract.in Only in xfdesktop-mine: intltool-merge.in Only in xfdesktop-mine: intltool-update.in Only in xfdesktop-mine: ltmain.sh Only in xfdesktop-mine: missing Only in xfdesktop-mine: mkinstalldirs Only in xfdesktop-mine/modules: Makefile.in Only in xfdesktop-mine/modules/menu: Makefile.in Only in xfdesktop-mine/pixmaps: Makefile.in Only in xfdesktop-mine/po: Makefile.in.in Only in xfdesktop-mine/po-doc: Makefile.in Only in xfdesktop/po-doc: xfdesktop.pot Only in xfdesktop-mine/settings: Makefile.in diff -crb xfdesktop/settings/main.c xfdesktop-mine/settings/main.c *** xfdesktop/settings/main.c Fri Jul 2 15:42:47 2010 --- xfdesktop-mine/settings/main.c Fri Jul 2 15:37:24 2010 *************** *** 26,32 **** #endif #include ! #ifdef HAVE_STDLIB_H #include #endif --- 26,32 ---- #endif #include ! #include #ifdef HAVE_STDLIB_H #include #endif *************** *** 133,138 **** --- 133,153 ---- TARGET_TEXT_URI_LIST = 0, }; + static char *replace_str(char *str, char *orig, char *rep) + { + static char buffer[4096]; + char *p; + + if(!(p = strstr(str, orig))) // Is 'orig' even in 'str'? + return str; + + strncpy(buffer, str, p-str); // Copy characters from 'str' start to 'orig' st$ + buffer[p-str] = '\0'; + + sprintf(buffer+(p-str), "%s%s", rep, p+strlen(orig)); + + return buffer; + } /* assumes gdk lock is held on function enter, and should be held * on function exit */ *************** *** 140,146 **** xfdesktop_settings_do_single_preview(GtkTreeModel *model, GtkTreeIter *iter) { ! gchar *name = NULL, *new_name = NULL, *filename = NULL; GdkPixbuf *pix, *pix_scaled = NULL; gtk_tree_model_get(model, iter, --- 155,161 ---- xfdesktop_settings_do_single_preview(GtkTreeModel *model, GtkTreeIter *iter) { ! gchar *name = NULL, *new_name = NULL, *filename = NULL, *cachefile = NULL; GdkPixbuf *pix, *pix_scaled = NULL; gtk_tree_model_get(model, iter, *************** *** 149,154 **** --- 164,177 ---- -1); gdk_threads_leave(); + cachefile = replace_str(name,"",""); + cachefile = replace_str(cachefile,"",""); + cachefile = g_strdup_printf(_("%sthumb-%s"),xfce_resource_lookup(XFCE_RESOURCE_CACHE, "xfce4/"),cachefile); + + if( access( cachefile, W_OK ) != -1 ) { + g_free(filename); + pix_scaled = gdk_pixbuf_new_from_file(cachefile,NULL); + } else { pix = gdk_pixbuf_new_from_file(filename, NULL); g_free(filename); *************** *** 167,176 **** --- 190,203 ---- height = PREVIEW_HEIGHT; pix_scaled = gdk_pixbuf_scale_simple(pix, width, height, GDK_INTERP_BILINEAR); + /* save thumb on hd */ + gdk_pixbuf_save(pix_scaled, cachefile, "jpeg", NULL, "quality", "75", NULL); g_object_unref(G_OBJECT(pix)); } + } g_free(name); + g_free(cachefile); gdk_threads_enter(); Only in xfdesktop-mine/src: Makefile.in Only in xfdesktop-mine/src: stamp-xfdesktop-marshal.h