diff options
| author | Hiroyuki Ikezoe <hiikezoe@src.gnome.org> | 2006-07-21 13:47:37 +0800 |
|---|---|---|
| committer | Hiroyuki Ikezoe <hiikezoe@src.gnome.org> | 2006-07-21 13:47:37 +0800 |
| commit | 3bd80dbe0bc0140ecf952aa31007dc6d4fe9bd8b (patch) | |
| tree | f950a8a9c66692e0ac89801d38c3ef91b16da8a7 | |
| parent | a4922ca221f3c5eea359598ec1ca5222af49fa57 (diff) | |
| download | gsoc2013-evolution-3bd80dbe0bc0140ecf952aa31007dc6d4fe9bd8b.tar gsoc2013-evolution-3bd80dbe0bc0140ecf952aa31007dc6d4fe9bd8b.tar.gz gsoc2013-evolution-3bd80dbe0bc0140ecf952aa31007dc6d4fe9bd8b.tar.bz2 gsoc2013-evolution-3bd80dbe0bc0140ecf952aa31007dc6d4fe9bd8b.tar.lz gsoc2013-evolution-3bd80dbe0bc0140ecf952aa31007dc6d4fe9bd8b.tar.xz gsoc2013-evolution-3bd80dbe0bc0140ecf952aa31007dc6d4fe9bd8b.tar.zst gsoc2013-evolution-3bd80dbe0bc0140ecf952aa31007dc6d4fe9bd8b.zip | |
** Fixes 342313. Use GTK_CHECK_VERSION instead of GTK_2_2.
** Fixes 342313.
* text/e-text.c: Use GTK_CHECK_VERSION instead of GTK_2_2.
svn path=/trunk/; revision=32365
| -rw-r--r-- | widgets/ChangeLog | 5 | ||||
| -rw-r--r-- | widgets/text/e-text.c | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/widgets/ChangeLog b/widgets/ChangeLog index 0c7836d905..0b349a6114 100644 --- a/widgets/ChangeLog +++ b/widgets/ChangeLog @@ -1,3 +1,8 @@ +2006-07-21 Hiroyuki Ikezoe <poincare@ikezoe.net> + + ** Fixes 342313. + * text/e-text.c: Use GTK_CHECK_VERSION instead of GTK_2_2. + 2006-07-05 Rajeev ramanathan <rajeevramanathan_2004@yaoo.co.in> * text/e-text.[ch]: Added code to render EText text diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c index de8afd5b8d..1cc802260e 100644 --- a/widgets/text/e-text.c +++ b/widgets/text/e-text.c @@ -2505,7 +2505,7 @@ e_text_copy_clipboard (EText *text) selection_end_pos - selection_start_pos); gtk_clipboard_set_text ( -#ifdef GTK_2_2 +#if GTK_CHECK_VERSION (2, 2, 0) gtk_widget_get_clipboard (GTK_WIDGET (GNOME_CANVAS_ITEM (text)->canvas), GDK_SELECTION_CLIPBOARD), #else @@ -2605,7 +2605,7 @@ e_text_update_primary_selection (EText *text) }; GtkClipboard *clipboard; -#ifdef GTK_2_2 +#if GTK_CHECK_VERSION (2, 2, 0) clipboard = gtk_widget_get_clipboard (GTK_WIDGET (GNOME_CANVAS_ITEM (text)->canvas), GDK_SELECTION_PRIMARY); #else clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY); @@ -2644,7 +2644,7 @@ e_text_paste (EText *text, GdkAtom selection) { g_object_ref (text); gtk_clipboard_request_text ( -#ifdef GTK_2_2 +#if GTK_CHECK_VERSION (2, 2, 0) gtk_widget_get_clipboard (GTK_WIDGET (GNOME_CANVAS_ITEM (text)->canvas), selection), @@ -2779,7 +2779,7 @@ e_text_do_popup (EText *text, GdkEventButton *button, int position) closure->position = position; gtk_clipboard_request_contents ( -#ifdef GTK_2_2 +#if GTK_CHECK_VERSION (2, 2, 0) gtk_widget_get_clipboard (GTK_WIDGET (GNOME_CANVAS_ITEM (text)->canvas), GDK_SELECTION_CLIPBOARD), |