aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/text
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2007-05-25 03:14:14 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2007-05-25 03:14:14 +0800
commit051f3691f2b12238e8382474138692ebd4e5db2a (patch)
treed94ba53c54df277d0c7b0ba74e50247f89d065d8 /widgets/text
parent2f1de610ab8fcf524d2bc9e6d737d3124833eb0b (diff)
downloadgsoc2013-evolution-051f3691f2b12238e8382474138692ebd4e5db2a.tar
gsoc2013-evolution-051f3691f2b12238e8382474138692ebd4e5db2a.tar.gz
gsoc2013-evolution-051f3691f2b12238e8382474138692ebd4e5db2a.tar.bz2
gsoc2013-evolution-051f3691f2b12238e8382474138692ebd4e5db2a.tar.lz
gsoc2013-evolution-051f3691f2b12238e8382474138692ebd4e5db2a.tar.xz
gsoc2013-evolution-051f3691f2b12238e8382474138692ebd4e5db2a.tar.zst
gsoc2013-evolution-051f3691f2b12238e8382474138692ebd4e5db2a.zip
** Fixes bug #424562
2007-05-24 Matthew Barnes <mbarnes@redhat.com> ** Fixes bug #424562 * e-util/eggtrayicon.c: * e-util/eggtrayicon.h: Evolution requires GTK+ 2.10 now so kill this widget. * e-util/Makefile.am: Remove eggtrayicon.c and eggtrayicon.h. * calendar/gui/dialogs/recur-comp.c (recur_component_dialog): * e-util/e-dialog-utils.c (e_notice): * plugins/calendar-weather/calendar-weather.c (e_calendar_weather_location): * widgets/text/e-text.c (e_text_copy_clipboard), (e_text_update_primary_selection), (e_text_paste), (e_text_do_popup): Remove check for obsolete GTK+ version. * gui/alarm-notify/alarm-queue.c: EggTrayIcon is dead; always use GtkStatusIcon. svn path=/trunk/; revision=33573
Diffstat (limited to 'widgets/text')
-rw-r--r--widgets/text/e-text.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index be81a88232..42e981cccd 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -2505,12 +2505,8 @@ e_text_copy_clipboard (EText *text)
selection_end_pos - selection_start_pos);
gtk_clipboard_set_text (
-#if GTK_CHECK_VERSION (2, 2, 0)
gtk_widget_get_clipboard (GTK_WIDGET (GNOME_CANVAS_ITEM (text)->canvas),
GDK_SELECTION_CLIPBOARD),
-#else
- gtk_clipboard_get (GDK_SELECTION_CLIPBOARD),
-#endif
str, -1);
g_free (str);
}
@@ -2605,11 +2601,7 @@ e_text_update_primary_selection (EText *text)
};
GtkClipboard *clipboard;
-#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);
-#endif
if (text->selection_start != text->selection_end) {
if (!gtk_clipboard_set_with_owner (clipboard, targets, G_N_ELEMENTS (targets),
@@ -2644,13 +2636,9 @@ e_text_paste (EText *text, GdkAtom selection)
{
g_object_ref (text);
gtk_clipboard_request_text (
-#if GTK_CHECK_VERSION (2, 2, 0)
gtk_widget_get_clipboard (GTK_WIDGET (GNOME_CANVAS_ITEM (text)->canvas),
selection),
-#else
- gtk_clipboard_get (selection),
-#endif
paste_received, text);
}
@@ -2779,13 +2767,9 @@ e_text_do_popup (EText *text, GdkEventButton *button, int position)
closure->position = position;
gtk_clipboard_request_contents (
-#if GTK_CHECK_VERSION (2, 2, 0)
gtk_widget_get_clipboard (GTK_WIDGET (GNOME_CANVAS_ITEM (text)->canvas),
GDK_SELECTION_CLIPBOARD),
-#else
- gtk_clipboard_get (GDK_SELECTION_CLIPBOARD),
-#endif
gdk_atom_intern ("TARGETS", FALSE),
popup_targets_received,
closure);