diff options
| author | Chris Toshok <toshok@ximian.com> | 2002-12-09 05:44:08 +0800 |
|---|---|---|
| committer | Chris Toshok <toshok@src.gnome.org> | 2002-12-09 05:44:08 +0800 |
| commit | 84fabde6ba83eb4dcae2aa428cfcfe220bc800db (patch) | |
| tree | b79257dae291ac76dc323e02bc748d84ffaeabc0 /widgets/text/e-entry.c | |
| parent | 0bf2d899d8c14f8f54aea57ceb3ffbb010e581fe (diff) | |
| download | gsoc2013-evolution-84fabde6ba83eb4dcae2aa428cfcfe220bc800db.tar.gz gsoc2013-evolution-84fabde6ba83eb4dcae2aa428cfcfe220bc800db.tar.zst gsoc2013-evolution-84fabde6ba83eb4dcae2aa428cfcfe220bc800db.zip | |
lots of stuff, add 2 e-text widgets, 1 readonly, the other writable (that
2002-12-08 Chris Toshok <toshok@ximian.com>
* tests/test-text.c: lots of stuff, add 2 e-text widgets, 1
readonly, the other writable (that uses the uri model..)
* gal/e-text/e-text.[ch]: lots of pango changes. we don't do
*anything* with gdk/e fonts now. everything is pango. There are
still some issues while editting but display should more or less
work properly now, and without all the performance problems.
* gal/e-text/e-completion-view.c (e_completion_view_expose_event):
use gtk_widget_send_expose instead of gtk_widget_event so we don't
get the annoying gtk warning.
* gal/e-text/e-entry.c (e_entry_dispose): make sure both the gdk
and gtk grabs are removed.
(e_entry_class_init): fill_color_gdk is a boxed type, not pointer.
* gal/e-text/e-text-model-uri.h (E_TYPE_TEXT_MODEL_URI): oops,
this should be e_text_model_uri_get_type, not
e_text_model_get_type.
svn path=/trunk/; revision=19054
Diffstat (limited to 'widgets/text/e-entry.c')
| -rw-r--r-- | widgets/text/e-entry.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/widgets/text/e-entry.c b/widgets/text/e-entry.c index 746fba6121..685dfdc6c2 100644 --- a/widgets/text/e-entry.c +++ b/widgets/text/e-entry.c @@ -1145,6 +1145,12 @@ e_entry_dispose (GObject *object) if (entry->priv->completion) g_object_unref (entry->priv->completion); + + if (entry->priv->ptr_grab) { + gdk_pointer_ungrab (GDK_CURRENT_TIME); + gtk_grab_remove (GTK_WIDGET (entry->priv->completion_view)); + } + if (entry->priv->completion_view_popup) { gtk_widget_destroy (GTK_WIDGET (entry->priv->completion_view_popup)); g_object_unref (entry->priv->completion_view_popup); @@ -1154,9 +1160,6 @@ e_entry_dispose (GObject *object) if (entry->priv->changed_since_keypress_tag) gtk_timeout_remove (entry->priv->changed_since_keypress_tag); - if (entry->priv->ptr_grab) - gdk_pointer_ungrab (GDK_CURRENT_TIME); - g_free (entry->priv); entry->priv = NULL; } @@ -1293,10 +1296,11 @@ e_entry_class_init (GObjectClass *object_class) G_PARAM_READWRITE)); g_object_class_install_property (object_class, PROP_FILL_COLOR_GDK, - g_param_spec_pointer ("fill_color_gdk", - _( "GDK fill color" ), - _( "GDK fill color" ), - G_PARAM_READWRITE)); + g_param_spec_boxed ("fill_color_gdk", + _( "GDK fill color" ), + _( "GDK fill color" ), + GDK_TYPE_COLOR, + G_PARAM_READWRITE)); g_object_class_install_property (object_class, PROP_FILL_COLOR_RGBA, g_param_spec_uint ("fill_color_rgba", |