--- a/pidgin/gtkimhtml.c Thu Feb 04 05:46:37 2010 +0000
+++ b/pidgin/gtkimhtml.c Thu Feb 04 05:44:27 2010 +0000
@@ -63,18 +63,8 @@
#include <pango/pango-font.h>
-/* GTK+ < 2.4.x hack, see pidgin.h for details. */
-#if (!GTK_CHECK_VERSION(2,4,0))
-#define GTK_WRAP_WORD_CHAR GTK_WRAP_WORD
-#endif
-
#define TOOLTIP_TIMEOUT 500
-/* GTK+ 2.0 hack */
-#if (!GTK_CHECK_VERSION(2,2,0))
-#define gtk_widget_get_clipboard(x, y) gtk_clipboard_get(y)
-#endif
-
static GtkTextViewClass *parent_class = NULL;
struct scalable_data {
@@ -552,10 +542,8 @@
gtk_window_set_title(GTK_WINDOW(imhtml->tip_window), "GtkIMHtml");
gtk_window_set_resizable (GTK_WINDOW (imhtml->tip_window), FALSE);
gtk_widget_set_name (imhtml->tip_window, "gtk-tooltips");
-#if GTK_CHECK_VERSION(2,10,0)
gtk_window_set_type_hint (GTK_WINDOW (imhtml->tip_window),
GDK_WINDOW_TYPE_HINT_TOOLTIP);
-#endif
g_signal_connect_swapped (G_OBJECT (imhtml->tip_window), "expose_event",
G_CALLBACK (gtk_imhtml_tip_paint), imhtml);
@@ -746,32 +734,6 @@
return FALSE;
}
-#if (!GTK_CHECK_VERSION(2,2,0))
-/*
- * XXX - This should be removed eventually.
- *
- * This function exists to work around a gross bug in GtkTextView.
- * Basically, we short circuit ctrl+a and ctrl+end because they make
- * el program go boom.
- *
- * It's supposed to be fixed in gtk2.2. You can view the bug report at
- * http://bugzilla.gnome.org/show_bug.cgi?id=107939
- */
-static gboolean
-gtk_key_pressed_cb(GtkIMHtml *imhtml, GdkEventKey *event, gpointer data)
-{
- if (event->state & GDK_CONTROL_MASK) {
- switch (event->keyval) {
- case 'a':
- case GDK_Home:
- case GDK_End:
- return TRUE;
- }
- }
- return FALSE;
-}
-#endif /* !(GTK+ >= 2.2.0) */
-
static gint
gtk_imhtml_expose_event (GtkWidget *widget,
GdkEventExpose *event)
@@ -1686,10 +1648,6 @@
g_signal_connect(G_OBJECT(imhtml), "motion-notify-event", G_CALLBACK(gtk_motion_event_notify), NULL);
g_signal_connect(G_OBJECT(imhtml), "leave-notify-event", G_CALLBACK(gtk_leave_event_notify), NULL);
g_signal_connect(G_OBJECT(imhtml), "enter-notify-event", G_CALLBACK(gtk_enter_event_notify), NULL);
-#if (!GTK_CHECK_VERSION(2,2,0))
- /* See the comment for gtk_key_pressed_cb */
- g_signal_connect(G_OBJECT(imhtml), "key_press_event", G_CALLBACK(gtk_key_pressed_cb), NULL);
-#endif
g_signal_connect(G_OBJECT(imhtml), "button_press_event", G_CALLBACK(gtk_imhtml_button_press_event), NULL);
g_signal_connect(G_OBJECT(imhtml->text_buffer), "insert-text", G_CALLBACK(preinsert_cb), imhtml);
g_signal_connect(G_OBJECT(imhtml->text_buffer), "delete_range", G_CALLBACK(delete_cb), imhtml);
@@ -3689,22 +3647,12 @@
image->filesel = NULL;
if (save->data && save->datasize) {
-#if GLIB_CHECK_VERSION(2,8,0)
g_file_set_contents(filename, save->data, save->datasize, &error);
-#else
- purple_util_write_data_to_file_absolute(filename, save->data, save->datasize);
-#endif
} else {
gchar *type = NULL;
-#if GTK_CHECK_VERSION(2,2,0)
GSList *formats = gdk_pixbuf_get_formats();
-#else
- char *basename = g_path_get_basename(filename);
- char *ext = strrchr(basename, '.');
-#endif
char *newfilename;
-#if GTK_CHECK_VERSION(2,2,0)
while (formats) {
GdkPixbufFormat *format = formats->data;
gchar **extensions = gdk_pixbuf_format_get_extensions(format);
@@ -3731,31 +3679,14 @@
}
g_slist_free(formats);
-#else
- /* this is really ugly code, but I think it will work */
- if (ext) {
- ext++;
- if (!g_ascii_strcasecmp(ext, "jpeg") || !g_ascii_strcasecmp(ext, "jpg"))
- type = g_strdup("jpeg");
- else if (!g_ascii_strcasecmp(ext, "png"))
- type = g_strdup("png");
- }
-
- g_free(basename);
-#endif
/* If I can't find a valid type, I will just tell the user about it and then assume
it's a png */
if (!type){
char *basename, *tmp;
char *dirname;
-#if GTK_CHECK_VERSION(2,4,0)
GtkWidget *dialog = gtk_message_dialog_new_with_markup(NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
_("<span size='larger' weight='bold'>Unrecognized file type</span>\n\nDefaulting to PNG."));
-#else
- GtkWidget *dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
- _("Unrecognized file type\n\nDefaulting to PNG."));
-#endif
g_signal_connect_swapped(dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog);
gtk_widget_show(dialog);
@@ -3784,20 +3715,14 @@
}
if (error){
-#if GTK_CHECK_VERSION(2,4,0)
GtkWidget *dialog = gtk_message_dialog_new_with_markup(NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
_("<span size='larger' weight='bold'>Error saving image</span>\n\n%s"), error->message);
-#else
- GtkWidget *dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
- _("Error saving image\n\n%s"), error->message);
-#endif
g_signal_connect_swapped(dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog);
gtk_widget_show(dialog);
g_error_free(error);
}
}
-#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
static void
image_save_check_if_exists_cb(GtkWidget *widget, gint response, GtkIMHtmlImageSave *save)
{
@@ -3811,32 +3736,6 @@
}
filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(widget));
-#else /* FILECHOOSER */
-static void
-image_save_check_if_exists_cb(GtkWidget *button, GtkIMHtmlImageSave *save)
-{
- gchar *filename;
- GtkIMHtmlImage *image = (GtkIMHtmlImage *)save->image;
-
- filename = g_strdup(gtk_file_selection_get_filename(GTK_FILE_SELECTION(image->filesel)));
-
- if (g_file_test(filename, G_FILE_TEST_IS_DIR)) {
- gchar *dirname;
- /* append a / is needed */
- if (filename[strlen(filename) - 1] != G_DIR_SEPARATOR) {
- dirname = g_strconcat(filename, G_DIR_SEPARATOR_S, NULL);
- } else {
- dirname = g_strdup(filename);
- }
- gtk_file_selection_set_filename(GTK_FILE_SELECTION(image->filesel), dirname);
- g_free(dirname);
- g_free(filename);
- return;
- }
-#endif /* FILECHOOSER */
-#if 0 /* mismatched curly braces */
- }
-#endif
/*
* XXX - We should probably prompt the user to determine if they really
@@ -3854,15 +3753,6 @@
g_free(filename);
}
-#if !GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
-static void
-image_save_cancel_cb(GtkIMHtmlImage *image)
-{
- gtk_widget_destroy(image->filesel);
- image->filesel = NULL;
-}
-#endif /* FILECHOOSER */
-
static void
gtk_imhtml_image_save(GtkWidget *w, GtkIMHtmlImageSave *save)
{
@@ -3873,7 +3763,6 @@
return;
}
-#if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
image->filesel = gtk_file_chooser_dialog_new(_("Save Image"),
NULL,
GTK_FILE_CHOOSER_ACTION_SAVE,
@@ -3885,17 +3774,6 @@
gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(image->filesel), image->filename);
g_signal_connect(G_OBJECT(GTK_FILE_CHOOSER(image->filesel)), "response",
G_CALLBACK(image_save_check_if_exists_cb), save);
-#else /* FILECHOOSER */
- image->filesel = gtk_file_selection_new(_("Save Image"));
- if (image->filename != NULL)
- gtk_file_selection_set_filename(GTK_FILE_SELECTION(image->filesel), image->filename);
- g_signal_connect_swapped(G_OBJECT(GTK_FILE_SELECTION(image->filesel)), "delete_event",
- G_CALLBACK(image_save_cancel_cb), image);
- g_signal_connect_swapped(G_OBJECT(GTK_FILE_SELECTION(image->filesel)->cancel_button),
- "clicked", G_CALLBACK(image_save_cancel_cb), image);
- g_signal_connect(G_OBJECT(GTK_FILE_SELECTION(image->filesel)->ok_button), "clicked",
- G_CALLBACK(image_save_check_if_exists_cb), save);
-#endif /* FILECHOOSER */
gtk_widget_show(image->filesel);
}
@@ -5006,9 +4884,7 @@
if (imhtml_smiley && imhtml_smiley->flags & GTK_IMHTML_SMILEY_CUSTOM) {
ebox = gtk_event_box_new();
-#if GTK_CHECK_VERSION(2,4,0)
gtk_event_box_set_visible_window(GTK_EVENT_BOX(ebox), FALSE);
-#endif
gtk_widget_show(ebox);
}
