xchat-gnome/gtk2-2.20.patch

   1 diff -urp xchat-gnome-0.26.1.OLD/src/fe-gnome/fe-gnome.c xchat-gnome-0.26.1/src/fe-gnome/fe-gnome.c
   2 --- xchat-gnome-0.26.1.OLD/src/fe-gnome/fe-gnome.c      2008-09-07 09:18:45.000000000 -0400
   3 +++ xchat-gnome-0.26.1/src/fe-gnome/fe-gnome.c  2010-03-28 16:16:52.181405173 -0400
   4 @@ -753,7 +753,7 @@ fe_gui_info (session * sess, int info_ty
   5  {
   6         switch (info_type) {
   7         case 0:
   8 -               if (!GTK_WIDGET_VISIBLE (GTK_WINDOW (gui.main_window))) {
   9 +               if (!gtk_widget_get_visible (GTK_WIDGET (gui.main_window))) {
  10                         return 2;
  11                 }
  12                 if (gtk_window_is_active (GTK_WINDOW (gui.main_window))) {
  13 diff -urp xchat-gnome-0.26.1.OLD/src/fe-gnome/find-bar.c xchat-gnome-0.26.1/src/fe-gnome/find-bar.c
  14 --- xchat-gnome-0.26.1.OLD/src/fe-gnome/find-bar.c      2007-03-09 10:42:57.000000000 -0500
  15 +++ xchat-gnome-0.26.1/src/fe-gnome/find-bar.c  2010-03-28 16:26:24.300405158 -0400
  16 @@ -247,7 +247,7 @@ find_bar_close (FindBar *bar)
  17  {
  18         gint position;
  19
  20 -       if (!GTK_WIDGET_VISIBLE (bar)) {
  21 +       if (!gtk_widget_get_visible (GTK_WIDGET (bar))) {
  22                 return;
  23         }
  24
  25 diff -urp xchat-gnome-0.26.1.OLD/src/fe-gnome/text-entry.c xchat-gnome-0.26.1/src/fe-gnome/text-entry.c
  26 --- xchat-gnome-0.26.1.OLD/src/fe-gnome/text-entry.c    2008-09-07 10:02:45.000000000 -0400
  27 +++ xchat-gnome-0.26.1/src/fe-gnome/text-entry.c        2010-03-28 16:39:48.755153605 -0400
  28 @@ -667,7 +667,7 @@ text_entry_set_current (TextEntry *entry
  29         char *selection = NULL, *text = NULL;
  30         int start, end;
  31
  32 -       g_return_if_fail (GTK_WIDGET_REALIZED (widget));
  33 +       g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (widget)));
  34
  35         if (sess == priv->current) {
  36                 return;
  37 diff -urp xchat-gnome-0.26.1.OLD/src/fe-gnome/userlist-gui.c xchat-gnome-0.26.1/src/fe-gnome/userlist-gui.c
  38 --- xchat-gnome-0.26.1.OLD/src/fe-gnome/userlist-gui.c  2008-10-13 17:02:16.000000000 -0400
  39 +++ xchat-gnome-0.26.1/src/fe-gnome/userlist-gui.c      2010-03-28 16:47:55.703154452 -0400
  40 @@ -261,12 +261,12 @@ userlist_gui_show (void)
  41
  42         gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gui.userlist_toggle), TRUE);
  43
  44 -       if (!GTK_WIDGET_REALIZED (gui.userlist_window)) {
  45 +       if (!gtk_widget_get_realized (GTK_WIDGET (gui.userlist_window))) {
  46                 gtk_widget_realize (gui.userlist_window);
  47         }
  48         gtk_widget_size_request (gui.userlist, &request);
  49
  50 -       if (GTK_WIDGET_REALIZED (gui.userlist_toggle))
  51 +       if (gtk_widget_get_realized (GTK_WIDGET (gui.userlist_toggle)))
  52                 anchor_widget = gui.userlist_toggle;
  53         else
  54                 anchor_widget = gui.main_window;
  55 diff -urp xchat-gnome-0.26.1.OLD/src/fe-gnome/xtext.c xchat-gnome-0.26.1/src/fe-gnome/xtext.c
  56 --- xchat-gnome-0.26.1.OLD/src/fe-gnome/xtext.c 2009-01-16 08:17:31.000000000 -0500
  57 +++ xchat-gnome-0.26.1/src/fe-gnome/xtext.c     2010-03-28 16:57:17.441402617 -0400
  58 @@ -1086,7 +1086,7 @@ gtk_xtext_size_allocate (GtkWidget * wid
  59         xtext->avoid_trans = FALSE;
  60
  61         widget->allocation = *allocation;
  62 -       if (GTK_WIDGET_REALIZED (widget))
  63 +       if (gtk_widget_get_realized (GTK_WIDGET (widget)))
  64         {
  65                 xtext->buffer->window_width = allocation->width;
  66                 xtext->buffer->window_height = allocation->height;
  67 @@ -4113,7 +4113,7 @@ gtk_xtext_set_palette (GtkXText * xtext,
  68                 xtext->palette[i] = palette[i].pixel;
  69         }
  70
  71 -       if (GTK_WIDGET_REALIZED (xtext))
  72 +       if (gtk_widget_get_realized (GTK_WIDGET (xtext)))
  73         {
  74                 xtext_set_fg (xtext, xtext->fgc, XTEXT_FG);
  75                 xtext_set_bg (xtext, xtext->fgc, XTEXT_BG);
  76 @@ -4211,7 +4211,7 @@ gtk_xtext_set_font (GtkXText *xtext, cha
  77
  78         gtk_xtext_fix_indent (xtext->buffer);
  79
  80 -       if (GTK_WIDGET_REALIZED (xtext))
  81 +       if (gtk_widget_get_realized (GTK_WIDGET (xtext)))
  82                 gtk_xtext_recalc_widths (xtext->buffer, TRUE);
  83
  84         return TRUE;
  85 @@ -4248,7 +4248,7 @@ gtk_xtext_set_background (GtkXText * xte
  86         if (trans)
  87         {
  88                 xtext->shaded = shaded;
  89 -               if (GTK_WIDGET_REALIZED (xtext))
  90 +               if (gtk_widget_get_realized (GTK_WIDGET (xtext)))
  91                         gtk_xtext_load_trans (xtext);
  92                 return;
  93         }
  94 @@ -4260,14 +4260,14 @@ gtk_xtext_set_background (GtkXText * xte
  95         if (pixmap != 0)
  96         {
  97                 g_object_ref (pixmap);
  98 -               if (GTK_WIDGET_REALIZED (xtext))
  99 +               if (gtk_widget_get_realized (GTK_WIDGET (xtext)))
 100                 {
 101                         gdk_gc_set_tile (xtext->bgc, pixmap);
 102                         gdk_gc_set_ts_origin (xtext->bgc, 0, 0);
 103                         xtext->ts_x = xtext->ts_y = 0;
 104                         gdk_gc_set_fill (xtext->bgc, GDK_TILED);
 105                 }
 106 -       } else if (GTK_WIDGET_REALIZED (xtext))
 107 +       } else if (gtk_widget_get_realized (GTK_WIDGET (xtext)))
 108         {
 109                 g_object_unref (xtext->bgc);
 110                 val.subwindow_mode = GDK_INCLUDE_INFERIORS;
 111 @@ -4516,7 +4516,7 @@ gtk_xtext_render_page (GtkXText * xtext)
 112         int subline;
 113         int startline = xtext->adj->value;
 114
 115 -       if(!GTK_WIDGET_REALIZED(xtext))
 116 +       if(!gtk_widget_get_realized (GTK_WIDGET (xtext)))
 117           return;
 118
 119         if (xtext->buffer->indent < MARGIN)
 120 @@ -4636,7 +4636,7 @@ gtk_xtext_render_page (GtkXText * xtext)
 121  void
 122  gtk_xtext_refresh (GtkXText * xtext, int do_trans)
 123  {
 124 -       if (GTK_WIDGET_REALIZED (GTK_WIDGET (xtext)))
 125 +       if (gtk_widget_get_realized (GTK_WIDGET (xtext)))
 126         {
 127  #if defined(USE_XLIB) || defined(WIN32)
 128                 if (xtext->transparent && do_trans)
 129 @@ -5204,7 +5204,7 @@ gtk_xtext_buffer_show (GtkXText *xtext,
 130                 xtext->io_tag = 0;
 131         }
 132
 133 -       if (!GTK_WIDGET_REALIZED (GTK_WIDGET (xtext)))
 134 +       if (!gtk_widget_get_realized (GTK_WIDGET (xtext)))
 135                 gtk_widget_realize (GTK_WIDGET (xtext));
 136
 137         gdk_drawable_get_size (GTK_WIDGET (xtext)->window, &w, &h);