Menu
▾
▴
[Gaim-commits] CVS: gaim/src gtkimhtml.c,1.212,1.213 gtkblist.c,1.121,1.122
|
From: Christian H. <ch...@us...> - 2003-10-31 15:06:39
|
Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv29432
Modified Files:
gtkimhtml.c gtkblist.c
Log Message:
Make gaim work with gtk2.0 again.
Index: gtkimhtml.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkimhtml.c,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -d -p -r1.212 -r1.213
--- gtkimhtml.c 30 Oct 2003 22:27:35 -0000 1.212
+++ gtkimhtml.c 31 Oct 2003 15:06:35 -0000 1.213
@@ -332,6 +332,7 @@ gboolean gtk_key_pressed_cb(GtkWidget *i
return FALSE;
}
+#if GTK_CHECK_VERSION(2,2,0)
static GtkIMHtmlCopyable *gtk_imhtml_copyable_new(GtkIMHtml *imhtml, GtkTextMark *mark, const gchar *text)
{
GtkIMHtmlCopyable *copy = g_malloc(sizeof(GtkIMHtmlCopyable));
@@ -390,6 +391,7 @@ static gboolean button_release_cb(GtkIMH
copy_clipboard_cb(imhtml, gtk_widget_get_clipboard(GTK_WIDGET(imhtml), GDK_SELECTION_PRIMARY));
return FALSE;
}
+#endif
static GtkTextViewClass *parent_class = NULL;
@@ -406,7 +408,9 @@ gtk_imhtml_finalize (GObject *object)
{
GtkIMHtml *imhtml = GTK_IMHTML(object);
GList *scalables;
+#if GTK_CHECK_VERSION(2,2,0)
GSList *copyables;
+#endif
g_hash_table_destroy(imhtml->smiley_data);
gtk_smiley_tree_destroy(imhtml->default_smilies);
@@ -423,12 +427,13 @@ gtk_imhtml_finalize (GObject *object)
scale->free(scale);
}
+#if GTK_CHECK_VERSION(2,2,0)
for (copyables = imhtml->copyables; copyables; copyables = copyables->next) {
GtkIMHtmlCopyable *copy = GTK_IMHTML_COPYABLE(copyables->data);
g_free(copy->text);
g_free(copy);
}
-
+#endif
g_list_free(imhtml->scalables);
G_OBJECT_CLASS(parent_class)->finalize (object);
}
@@ -492,8 +497,10 @@ static void gtk_imhtml_init (GtkIMHtml *
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), "key_press_event", G_CALLBACK(gtk_key_pressed_cb), NULL);
+#if GTK_CHECK_VERSION(2,2,0)
g_signal_connect(G_OBJECT(imhtml), "copy-clipboard", G_CALLBACK(copy_clipboard_cb), NULL);
g_signal_connect(G_OBJECT(imhtml), "button-release-event", G_CALLBACK(button_release_cb), imhtml);
+#endif
gtk_widget_add_events(GTK_WIDGET(imhtml), GDK_LEAVE_NOTIFY_MASK);
imhtml->tip = NULL;
@@ -501,7 +508,9 @@ static void gtk_imhtml_init (GtkIMHtml *
imhtml->tip_window = NULL;
imhtml->scalables = NULL;
+#if GTK_CHECK_VERSION(2,2,0)
imhtml->copyables = NULL;
+#endif
}
GtkWidget *gtk_imhtml_new(void *a, void *b)
@@ -1464,9 +1473,11 @@ GString* gtk_imhtml_append_text_with_ima
if (icon) {
gtk_widget_show(icon);
gtk_text_view_add_child_at_anchor(GTK_TEXT_VIEW(imhtml), icon, anchor);
+#if GTK_CHECK_VERSION(2,2,0)
gtk_imhtml_copyable_new(imhtml,
gtk_text_buffer_create_mark(imhtml->text_buffer, NULL, &iter, TRUE),
ws);
+#endif
}
copy = iter;
Index: gtkblist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/gtkblist.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -p -r1.121 -r1.122
--- gtkblist.c 30 Oct 2003 22:27:34 -0000 1.121
+++ gtkblist.c 31 Oct 2003 15:06:35 -0000 1.122
@@ -109,6 +109,7 @@ struct _gaim_gtk_blist_node {
gboolean contact_expanded;
};
+#if GTK_CHECK_VERSION(2,2,0)
/**************************** Weird drop shadow stuff *******************/
/* This is based on a patch for drop shadows in GTK menus available at http://www.xfce.org/gtkmenu-shadow/ */
@@ -399,7 +400,7 @@ map_shadow_windows (gpointer data)
}
/**************** END WEIRD DROP SHADOW STUFF ***********************************/
-
+#endif
static GSList *blist_prefs_callbacks = NULL;
/***************************************************
@@ -1256,8 +1257,10 @@ static void gaim_gtk_blist_paint_tip(Gtk
g_object_unref (layout);
g_free(tooltiptext);
+#if GTK_CHECK_VERSION(2,2,0)
shadow_paint(gtkblist, NULL, EAST_SIDE);
shadow_paint(gtkblist, NULL, SOUTH_SIDE);
+#endif
return;
}
@@ -1271,7 +1274,9 @@ static gboolean gaim_gtk_blist_tooltip_t
int scr_w,scr_h, w, h, x, y;
PangoLayout *layout;
char *tooltiptext = NULL;
+#if GTK_CHECK_VERSION(2,2,0)
GdkWindowAttr attr;
+#endif
if (!gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(tv), gtkblist->rect.x, gtkblist->rect.y, &path, NULL, NULL, NULL))
return FALSE;
@@ -1297,6 +1302,7 @@ static gboolean gaim_gtk_blist_tooltip_t
G_CALLBACK(gaim_gtk_blist_paint_tip), node);
gtk_widget_ensure_style (gtkblist->tipwindow);
+#if GTK_CHECK_VERSION(2,2,0)
attr.window_type = GDK_WINDOW_TEMP;
attr.override_redirect = TRUE;
attr.x = gtkblist->tipwindow->allocation.x;
@@ -1320,6 +1326,7 @@ static gboolean gaim_gtk_blist_tooltip_t
GDK_WA_NOREDIR | GDK_WA_VISUAL | GDK_WA_COLORMAP);
gdk_window_set_user_data (gtkblist->south_shadow, gtkblist->tipwindow);
gdk_window_set_back_pixmap (gtkblist->south_shadow, NULL, FALSE);
+#endif
layout = gtk_widget_create_pango_layout (gtkblist->tipwindow, NULL);
pango_layout_set_wrap(layout, PANGO_WRAP_WORD);
@@ -1358,7 +1365,9 @@ static gboolean gaim_gtk_blist_tooltip_t
gtk_window_move(GTK_WINDOW(gtkblist->tipwindow), x, y);
gtk_widget_show(gtkblist->tipwindow);
+#if GTK_CHECK_VERSION(2,2,0)
map_shadow_windows(gtkblist);
+#endif
return FALSE;
}
@@ -1372,6 +1381,7 @@ static gboolean gaim_gtk_blist_motion_cb
/* We've left the cell. Remove the timeout and create a new one below */
if (gtkblist->tipwindow) {
gtk_widget_destroy(gtkblist->tipwindow);
+#if GTK_CHECK_VERSION(2,2,0)
gdk_window_set_user_data (gtkblist->east_shadow, NULL);
gdk_window_destroy (gtkblist->east_shadow);
gtkblist->east_shadow = NULL;
@@ -1379,6 +1389,7 @@ static gboolean gaim_gtk_blist_motion_cb
gdk_window_set_user_data (gtkblist->south_shadow, NULL);
gdk_window_destroy (gtkblist->south_shadow);
gtkblist->south_shadow = NULL;
+#endif
gtkblist->tipwindow = NULL;
}
@@ -1401,6 +1412,7 @@ static void gaim_gtk_blist_leave_cb (Gtk
}
if (gtkblist->tipwindow) {
gtk_widget_destroy(gtkblist->tipwindow);
+#if GTK_CHECK_VERSION(2,2,0)
gdk_window_set_user_data (gtkblist->east_shadow, NULL);
gdk_window_destroy (gtkblist->east_shadow);
gtkblist->east_shadow = NULL;
@@ -1408,6 +1420,7 @@ static void gaim_gtk_blist_leave_cb (Gtk
gdk_window_set_user_data (gtkblist->south_shadow, NULL);
gdk_window_destroy (gtkblist->south_shadow);
gtkblist->south_shadow = NULL;
+#endif
gtkblist->tipwindow = NULL;
}
}
|
