diff options
| author | Yuedong Du <yuedong.du@sun.com> | 2003-07-15 17:46:45 +0800 |
|---|---|---|
| committer | Yuedong Du <york@src.gnome.org> | 2003-07-15 17:46:45 +0800 |
| commit | feff37573756a1e7f02079e32cee51bffec086a3 (patch) | |
| tree | 7f76321e6550ac564009621de98e1ff575b1f7a5 | |
| parent | 6ed89aec8563c3675d77d0d1b0832db9cc3bbe30 (diff) | |
| download | gsoc2013-evolution-feff37573756a1e7f02079e32cee51bffec086a3.tar.gz gsoc2013-evolution-feff37573756a1e7f02079e32cee51bffec086a3.tar.zst gsoc2013-evolution-feff37573756a1e7f02079e32cee51bffec086a3.zip | |
remove the use of caret mode widget style. use new gtkhtml api to set
2003-07-15 Yuedong Du <yuedong.du@sun.com>
* mail-config.c: (config_write_style), (mail_config_init): remove
the use of caret mode widget style.
* mail-display.c: (display_notify), (mail_display_new): use new
gtkhtml api to set caret mode.
svn path=/trunk/; revision=21816
| -rw-r--r-- | mail/ChangeLog | 7 | ||||
| -rw-r--r-- | mail/mail-config.c | 6 | ||||
| -rw-r--r-- | mail/mail-display.c | 3 |
3 files changed, 10 insertions, 6 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 12004832c9..0632fb7935 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,10 @@ +2003-07-15 Yuedong Du <yuedong.du@sun.com> + + * mail-config.c: (config_write_style), (mail_config_init): remove + the use of caret mode widget style. + * mail-display.c: (display_notify), (mail_display_new): use new + gtkhtml api to set caret mode. + 2003-07-11 Antonio Xu <antonio.xu@sun.com> * folder-browser-ui.c: Change the EditPaste mask to IS_0MESSAGE so diff --git a/mail/mail-config.c b/mail/mail-config.c index 9fce11013d..2881d7603e 100644 --- a/mail/mail-config.c +++ b/mail/mail-config.c @@ -85,7 +85,6 @@ typedef struct { guint font_notify_id; guint spell_notify_id; - guint caret_mode_notify_id; GPtrArray *mime_types; guint mime_types_notify_id; @@ -442,7 +441,6 @@ config_write_style (void) char *fix_font; char *var_font; gint red = 0xffff, green = 0, blue = 0; - gboolean caret_mode; /* * This is the wrong way to get the path but it needs to @@ -465,14 +463,12 @@ config_write_style (void) custom = gconf_client_get_bool (config->gconf, "/apps/evolution/mail/display/fonts/use_custom", NULL); var_font = gconf_client_get_string (config->gconf, "/apps/evolution/mail/display/fonts/variable", NULL); fix_font = gconf_client_get_string (config->gconf, "/apps/evolution/mail/display/fonts/monospace", NULL); - caret_mode = gconf_client_get_bool (config->gconf, "/apps/evolution/mail/display/caret_mode", NULL); CONFIG_GET_SPELL_VALUE (int, "/spell_error_color_red", red, (void)0, (int)); CONFIG_GET_SPELL_VALUE (int, "/spell_error_color_green", green, (void)0, (int)); CONFIG_GET_SPELL_VALUE (int, "/spell_error_color_blue", blue, (void)0, (int)); fprintf (rc, "style \"evolution-mail-custom-fonts\" {\n"); - fprintf (rc, " GtkHTML::caret_mode = %d\n", caret_mode ? 1 :0); fprintf (rc, " GtkHTML::spell_error_color = \"#%02x%02x%02x\"\n", 0xff & (red >> 8), 0xff & (green >> 8), 0xff & (blue >> 8)); @@ -546,8 +542,6 @@ mail_config_init (void) gconf_style_changed, NULL, NULL, NULL); config->spell_notify_id = gconf_client_notify_add (config->gconf, "/GNOME/Spell", gconf_style_changed, NULL, NULL, NULL); - config->caret_mode_notify_id = gconf_client_notify_add (config->gconf, "/apps/evolution/mail/display/caret_mode", - gconf_style_changed, NULL, NULL, NULL); gconf_client_add_dir (config->gconf, "/apps/evolution/mail/labels", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); diff --git a/mail/mail-display.c b/mail/mail-display.c index d62c985d32..4a81e5ae59 100644 --- a/mail/mail-display.c +++ b/mail/mail-display.c @@ -2645,6 +2645,8 @@ display_notify (GConfClient *gconf, guint cnxn_id, GConfEntry *entry, gpointer d } else if (!strcmp (tkey, "/citation_color") || !strcmp (tkey, "/mark_citations")) { mail_display_queue_redisplay (md); + } else if (!strcmp (tkey, "/caret_mode")) { + gtk_html_set_caret_mode(md->html, gconf_value_get_bool (gconf_entry_get_value(entry))); } } @@ -2691,6 +2693,7 @@ mail_display_new (void) gconf = mail_config_get_gconf_client (); gtk_html_set_animate (GTK_HTML (html), gconf_client_get_bool (gconf, "/apps/evolution/mail/display/animate_images", NULL)); + gtk_html_set_caret_mode (GTK_HTML (html), gconf_client_get_bool (gconf, "/apps/evolution/mail/display/caret_mode", NULL)); gconf_client_add_dir (gconf, "/apps/evolution/mail/display",GCONF_CLIENT_PRELOAD_NONE, NULL); mail_display->priv->display_notify_id = gconf_client_notify_add (gconf, "/apps/evolution/mail/display", |