diff options
Diffstat (limited to 'e-util')
| -rw-r--r-- | e-util/ChangeLog | 29 | ||||
| -rw-r--r-- | e-util/e-plugin.c | 2 | ||||
| -rw-r--r-- | e-util/e-util.c | 90 |
3 files changed, 1 insertions, 120 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog index ad8aaee230..313470351b 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,13 +1,3 @@ -2006-07-22 Harish Krishnaswamy <kharish@novell.com> - - * e-util.c: (get_font_options): Handle cases when the - props are undefined. This bug is currently causing Evo - to crash as soon as it comes up. - -2006-07-20 Rajeev ramanathan <rajeevramanathan_2004@yahoo.co.in> - - * e-util.[ch]: (get_font_options): Added code to get font options. - 2006-06-15 Tor Lillqvist <tml@novell.com> * e-plugin.c (ep_construct): On Win32, if the compile-time @@ -32,25 +22,6 @@ configure.in for the support of %l and %k has now been made more reliable so it actually works also on Win32.) -2006-06-02 Frederic Peters <fpeters@entrouvert.com> - - * e-error.c: Set new scroll member to false in static - declarations. Fixes build breaker #343446. - -2006-05-30 Srinivasa Ragavan <sragavan@novell.com> - - * e-error.c: (ee_load), (e_error_newv): Added a new property - called scroll, to show the messages in a scrolled view port. - -2006-05-25 Srinivasa Ragavan <sragavan@novell.com> - - * e-dialog-utils.c: (save_ok), (e_file_dialog_save), - (save_folder_ok), (e_file_dialog_save_folder): Added code - to enable file chooser to work with remote shares - * e-util.c: (e_write_file), (e_write_file_uri): Added - a new api to write to remote shares. - * e-util.h: - 2006-04-26 Li Yuan <li.yuan@sun.com> * e-text-event-processor-emacs-like.c: diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c index b645524569..9f24ca6eaa 100644 --- a/e-util/e-plugin.c +++ b/e-util/e-plugin.c @@ -195,7 +195,7 @@ ep_construct(EPlugin *ep, xmlNodePtr root) if (!g_hash_table_lookup_extended(ep_plugins_pending_hooks, class, (void **)&oldclass, (void **)&l)) { oldclass = class; l = NULL; - } + } else { g_free(class); } diff --git a/e-util/e-util.c b/e-util/e-util.c index b2c111589d..50094890c4 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -39,7 +39,6 @@ #include <glib/gstdio.h> #include <gtk/gtk.h> #include <libgnome/gnome-util.h> -#include <libgnomevfs/gnome-vfs.h> #ifdef G_OS_WIN32 #include <windows.h> @@ -240,35 +239,6 @@ e_write_file(const char *filename, const char *data, int flags) } gint -e_write_file_uri (const char *filename, const char *data) -{ - guint64 length = strlen(data); - guint64 bytes; - GnomeVFSResult result; - GnomeVFSHandle *handle = NULL; - - result = gnome_vfs_create (&handle, filename, GNOME_VFS_OPEN_WRITE, TRUE, 0755); - if (result != GNOME_VFS_OK) { - g_warning ("Couldn't save item"); - return 1; - } - - while (length > 0) { - gnome_vfs_write(handle, data, length, &bytes); - if (bytes > 0) { - length -= bytes; - data += bytes; - } else { - gnome_vfs_close(handle); - return 1; - } - } - - gnome_vfs_close (handle); - return 0; -} - -gint e_write_file_mkstemp(char *filename, const char *data) { int fd; @@ -1125,63 +1095,3 @@ e_gettext (const char *msgid) return dgettext (E_I18N_DOMAIN, msgid); } - -cairo_font_options_t * -get_font_options () -{ - char *antialiasing, *hinting, *subpixel_order; - GConfClient *gconf = gconf_client_get_default (); - cairo_font_options_t *font_options = cairo_font_options_create (); - - /* Antialiasing */ - antialiasing = gconf_client_get_string (gconf, - "/desktop/gnome/font_rendering/antialiasing", NULL); - if (antialiasing == NULL) - cairo_font_options_set_antialias (font_options, CAIRO_ANTIALIAS_DEFAULT); - else { - if (strcmp (antialiasing, "grayscale") == 0) - cairo_font_options_set_antialias (font_options, CAIRO_ANTIALIAS_GRAY); - else if (strcmp (antialiasing, "rgba") == 0) - cairo_font_options_set_antialias (font_options, CAIRO_ANTIALIAS_SUBPIXEL); - else if (strcmp (antialiasing, "none") == 0) - cairo_font_options_set_antialias (font_options, CAIRO_ANTIALIAS_NONE); - else - cairo_font_options_set_antialias (font_options, CAIRO_ANTIALIAS_DEFAULT); - } - hinting = gconf_client_get_string (gconf, - "/desktop/gnome/font_rendering/hinting", NULL); - if (hinting == NULL) - cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_DEFAULT); - else { - if (strcmp (hinting, "full") == 0) - cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_FULL); - else if (strcmp (hinting, "medium") == 0) - cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_MEDIUM); - else if (strcmp (hinting, "slight") == 0) - cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_SLIGHT); - else if (strcmp (hinting, "none") == 0) - cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_NONE); - else - cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_DEFAULT); - } - subpixel_order = gconf_client_get_string (gconf, - "/desktop/gnome/font_rendering/rgba_order", NULL); - if (subpixel_order == NULL) - cairo_font_options_set_subpixel_order (font_options, CAIRO_SUBPIXEL_ORDER_DEFAULT); - else { - if (strcmp (subpixel_order, "rgb") == 0) - cairo_font_options_set_subpixel_order (font_options, CAIRO_SUBPIXEL_ORDER_RGB); - else if (strcmp (subpixel_order, "bgr") == 0) - cairo_font_options_set_subpixel_order (font_options, CAIRO_SUBPIXEL_ORDER_BGR); - else if (strcmp (subpixel_order, "vrgb") == 0) - cairo_font_options_set_subpixel_order (font_options, CAIRO_SUBPIXEL_ORDER_VRGB); - else if (strcmp (subpixel_order, "vbgr") == 0) - cairo_font_options_set_subpixel_order (font_options, CAIRO_SUBPIXEL_ORDER_VBGR); - else - cairo_font_options_set_subpixel_order (font_options, CAIRO_SUBPIXEL_ORDER_DEFAULT); - } - g_object_unref (gconf); - return font_options; -} - - |