recipes/xchat/files/53_fix_deprecated_widgets.dpatch

   1 #! /bin/sh /usr/share/dpatch/dpatch-run
   2 ## 53_fix_deprecated_widgets.dpatch by Davide Puricelli <evo@debian.org>
   3 ##
   4 ## Description: Fix FTBFS errors due to new GTK 2.20 widgets names.
   5
   6 @DPATCH@
   7 diff -Naur xchat-2.8.6foo/src/fe-gtk/fe-gtk.c xchat-2.8.6/src/fe-gtk/fe-gtk.c
   8 --- xchat-2.8.6foo/src/fe-gtk/fe-gtk.c  2010-04-06 21:48:19.000000000 +0200
   9 +++ xchat-2.8.6/src/fe-gtk/fe-gtk.c     2010-04-06 21:49:27.000000000 +0200
  10 @@ -819,7 +819,7 @@
  11         switch (info_type)
  12         {
  13         case 0: /* window status */
  14 -               if (!GTK_WIDGET_VISIBLE (GTK_WINDOW (sess->gui->window)))
  15 +               if (!gtk_widget_get_visible (GTK_WINDOW (sess->gui->window)))
  16                         return 2;       /* hidden (iconified or systray) */
  17  #if GTK_CHECK_VERSION(2,4,0)
  18                 if (gtk_window_is_active (GTK_WINDOW (sess->gui->window)))
  19 diff -Naur xchat-2.8.6foo/src/fe-gtk/maingui.c xchat-2.8.6/src/fe-gtk/maingui.c
  20 --- xchat-2.8.6foo/src/fe-gtk/maingui.c 2008-04-01 10:53:41.000000000 +0200
  21 +++ xchat-2.8.6/src/fe-gtk/maingui.c    2010-04-06 21:50:45.000000000 +0200
  22 @@ -599,7 +599,7 @@
  23         int num;
  24         GtkWidget *f = NULL;
  25
  26 -       if (current_sess && GTK_WIDGET_HAS_FOCUS (current_sess->gui->input_box))
  27 +       if (current_sess && gtk_widget_has_focus (current_sess->gui->input_box))
  28                 f = current_sess->gui->input_box;
  29
  30         num = gtk_notebook_page_num (GTK_NOTEBOOK (mg_gui->note_book), box);
  31 @@ -809,8 +809,8 @@
  32  static void
  33  mg_hide_empty_pane (GtkPaned *pane)
  34  {
  35 -       if ((pane->child1 == NULL || !GTK_WIDGET_VISIBLE (pane->child1)) &&
  36 -                (pane->child2 == NULL || !GTK_WIDGET_VISIBLE (pane->child2)))
  37 +       if ((pane->child1 == NULL || !gtk_widget_get_visible (pane->child1)) &&
  38 +                (pane->child2 == NULL || !gtk_widget_get_visible (pane->child2)))
  39         {
  40                 gtk_widget_hide (GTK_WIDGET (pane));
  41                 return;
  42 diff -Naur xchat-2.8.6foo/src/fe-gtk/menu.c xchat-2.8.6/src/fe-gtk/menu.c
  43 --- xchat-2.8.6foo/src/fe-gtk/menu.c    2008-06-08 09:59:37.000000000 +0200
  44 +++ xchat-2.8.6/src/fe-gtk/menu.c       2010-04-06 21:49:54.000000000 +0200
  45 @@ -1670,7 +1670,7 @@
  46  menu_canacaccel (GtkWidget *widget, guint signal_id, gpointer user_data)
  47  {
  48         /* GTK2.2 behaviour */
  49 -       return GTK_WIDGET_IS_SENSITIVE (widget);
  50 +       return gtk_widget_is_sensitive (widget);
  51  }
  52
  53  #endif