xfburn-ui.patch

   1 diff -ur xfburn-0.4.3/configure.in xfburn-0.4.3-4ui/configure.in
   2 --- xfburn-0.4.3/configure.in   2011-02-26 20:25:11.173013553 +0100
   3 +++ xfburn-0.4.3-4ui/configure.in       2011-02-26 19:16:30.409029549 +0100
   4 @@ -38,7 +38,7 @@
   5  XDT_CHECK_PACKAGE([LIBISOFS], [libisofs-1], [0.6.2])
   6  XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0])
   7  XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.10.0])
   8 -XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
   9 +XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
  10  XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.4], [], [XDT_CHECK_PACKAGE([EXO], [exo-1], [0.3.100])])
  11  XDT_CHECK_PACKAGE([LIBGIO], [gio-2.0], [2.22.0])
  12  XDT_CHECK_PACKAGE([LIBGIOUNIX], [gio-unix-2.0], [2.16.0])
  13 diff -ur xfburn-0.4.3/xfburn/Makefile.am xfburn-0.4.3-4ui/xfburn/Makefile.am
  14 --- xfburn-0.4.3/xfburn/Makefile.am     2011-02-26 20:25:11.174013553 +0100
  15 +++ xfburn-0.4.3-4ui/xfburn/Makefile.am 2011-02-26 19:17:52.972029553 +0100
  16 @@ -95,7 +95,7 @@
  17         $(GTHREAD_CFLAGS)                                               \
  18         $(LIBBURN_CFLAGS)                                               \
  19         $(LIBISOFS_CFLAGS)                                              \
  20 -       $(LIBXFCEGUI4_CFLAGS)                                           \
  21 +       $(LIBXFCE4UI_CFLAGS)                                            \
  22         $(EXO_CFLAGS)                                                   \
  23         $(GIO_CFLAGS)                                                   \
  24         $(GIO_UNIX_CFLAGS)                                              \
  25 @@ -106,7 +106,7 @@
  26         $(GTHREAD_LIBS)                                                 \
  27         $(LIBBURN_LIBS)                                                 \
  28         $(LIBISOFS_LIBS)                                                \
  29 -       $(LIBXFCEGUI4_LIBS)                                             \
  30 +       $(LIBXFCE4UI_LIBS)                                              \
  31         $(EXO_LIBS)                                                     \
  32         $(GIO_LIBS)                                                     \
  33         $(GIO_UNIX_LIBS)                                                \
  34 diff -ur xfburn-0.4.3/xfburn/xfburn-audio-composition.c xfburn-0.4.3-4ui/xfburn/xfburn-audio-composition.c
  35 --- xfburn-0.4.3/xfburn/xfburn-audio-composition.c      2011-02-26 20:25:11.175013553 +0100
  36 +++ xfburn-0.4.3-4ui/xfburn/xfburn-audio-composition.c  2011-02-26 20:12:31.066324063 +0100
  37 @@ -32,7 +32,7 @@
  38
  39  #include <gtk/gtk.h>
  40  #include <libxfce4util/libxfce4util.h>
  41 -#include <libxfcegui4/libxfcegui4.h>
  42 +#include <libxfce4ui/libxfce4ui.h>
  43
  44  #include <gio/gio.h>
  45
  46 @@ -577,7 +577,7 @@
  47      dialog = xfburn_burn_audio_cd_composition_dialog_new (src);
  48      break;
  49    case DVD_DISC:
  50 -    xfce_err (_("Cannot burn audio onto a DVD."));
  51 +    xfce_dialog_show_error (NULL, NULL, _("Cannot burn audio onto a DVD."));
  52      return;
  53      break;
  54    }
  55 @@ -1021,7 +1021,7 @@
  56  {
  57    XfburnAudioCompositionPrivate *priv = XFBURN_AUDIO_COMPOSITION_GET_PRIVATE (dc);
  58
  59 -  xfce_info (xfburn_transcoder_get_description (priv->trans));
  60 +  xfce_dialog_show_info(NULL, NULL, xfburn_transcoder_get_description (priv->trans));
  61  }
  62
  63  static void
  64 @@ -1089,14 +1089,14 @@
  65    g_assert (error != NULL);
  66
  67    if (error->domain != XFBURN_ERROR) {
  68 -    xfce_warn (error->message);
  69 +    xfce_dialog_show_warning(NULL, NULL, error->message);
  70      return;
  71    }
  72
  73    if (g_hash_table_lookup (priv->warned_about, GINT_TO_POINTER (error->code)) == NULL) {
  74      g_hash_table_insert (priv->warned_about, GINT_TO_POINTER (error->code), did_warn);
  75
  76 -    xfce_warn (error->message);
  77 +    xfce_dialog_show_warning(NULL, NULL, error->message);
  78    }
  79  }
  80
  81 @@ -1141,7 +1141,7 @@
  82
  83      gdk_threads_enter ();
  84      if (file_exists_on_same_level (model, tree_path, FALSE, name)) {
  85 -      xfce_err (_("A file with the same name is already present in the composition."));
  86 +      xfce_dialog_show_error (NULL, NULL, _("A file with the same name is already present in the composition."));
  87
  88        gtk_tree_path_free (tree_path);
  89        gdk_threads_leave ();
  90 @@ -1225,7 +1225,7 @@
  91          if (g_hash_table_lookup (priv->warned_about, GINT_TO_POINTER (err_code)) == NULL) {
  92            g_hash_table_insert (priv->warned_about, GINT_TO_POINTER (err_code), did_warn);
  93            gdk_threads_enter ();
  94 -          xfce_err (_("You can only have a maximum of 99 tracks."));
  95 +          xfce_dialog_show_error (NULL, NULL, _("You can only have a maximum of 99 tracks."));
  96            gdk_threads_leave ();
  97          }
  98
  99 @@ -1475,7 +1475,7 @@
 100
 101        /*
 102        if (file_exists_on_same_level (model, path_level, FALSE, name)) {
 103 -        xfce_warn (_("A file named \"%s\" already exists in this directory, the file hasn't been added."), name);
 104 +        xfce_dialog_warning(NULL, _("A file named \"%s\" already exists in this directory, the file hasn't been added."), name);
 105          goto cleanup;
 106        }
 107        */
 108 diff -ur xfburn-0.4.3/xfburn/xfburn-audio-disc-usage.c xfburn-0.4.3-4ui/xfburn/xfburn-audio-disc-usage.c
 109 --- xfburn-0.4.3/xfburn/xfburn-audio-disc-usage.c       2009-10-24 23:18:10.000000000 +0200
 110 +++ xfburn-0.4.3-4ui/xfburn/xfburn-audio-disc-usage.c   2011-02-26 16:21:03.534320584 +0100
 111 @@ -22,7 +22,6 @@
 112
 113  #include <gtk/gtk.h>
 114  #include <libxfce4util/libxfce4util.h>
 115 -#include <libxfcegui4/libxfcegui4.h>
 116
 117  #include "xfburn-disc-usage.h"
 118  #include "xfburn-audio-disc-usage.h"
 119 diff -ur xfburn-0.4.3/xfburn/xfburn-blank-dialog.c xfburn-0.4.3-4ui/xfburn/xfburn-blank-dialog.c
 120 --- xfburn-0.4.3/xfburn/xfburn-blank-dialog.c   2011-02-26 20:25:11.176013553 +0100
 121 +++ xfburn-0.4.3-4ui/xfburn/xfburn-blank-dialog.c       2011-02-26 20:13:58.518013555 +0100
 122 @@ -20,7 +20,7 @@
 123  #include <config.h>
 124  #endif /* !HAVE_CONFIG_H */
 125
 126 -#include <libxfcegui4/libxfcegui4.h>
 127 +#include <libxfce4ui/libxfce4ui.h>
 128
 129  #include <libburn.h>
 130
 131 @@ -206,7 +206,7 @@
 132    g_signal_connect (G_OBJECT (priv->device_box), "volume-changed", G_CALLBACK (cb_volume_changed), obj);
 133    gtk_widget_show (priv->device_box);
 134
 135 -  frame = xfce_create_framebox_with_content (_("Burning device"), priv->device_box);
 136 +  frame = xfce_gtk_frame_box_new_with_content (_("Burning device"), priv->device_box);
 137    gtk_widget_show (frame);
 138    gtk_box_pack_start (box, frame, FALSE, FALSE, BORDER);
 139
 140 @@ -219,7 +219,7 @@
 141    gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (priv->combo_type), cell, "text", BLANK_COMBO_NAME_COLUMN, NULL);
 142    gtk_widget_show (priv->combo_type);
 143
 144 -  frame = xfce_create_framebox_with_content (_("Blank mode"), priv->combo_type);
 145 +  frame = xfce_gtk_frame_box_new_with_content (_("Blank mode"), priv->combo_type);
 146    gtk_widget_show (frame);
 147    gtk_box_pack_start (box, frame, FALSE, FALSE, BORDER);
 148
 149 @@ -227,7 +227,7 @@
 150    vbox = gtk_vbox_new (FALSE, 0);
 151    gtk_widget_show (vbox);
 152
 153 -  frame = xfce_create_framebox_with_content (_("Options"), vbox);
 154 +  frame = xfce_gtk_frame_box_new_with_content (_("Options"), vbox);
 155    gtk_widget_show (frame);
 156    gtk_box_pack_start (box, frame, FALSE, FALSE, BORDER);
 157
 158 @@ -241,7 +241,7 @@
 159    gtk_widget_show (button);
 160    gtk_dialog_add_action_widget (GTK_DIALOG (obj), button, GTK_RESPONSE_CANCEL);
 161
 162 -  button = xfce_create_mixed_button ("xfburn-blank-cdrw", _("_Blank"));
 163 +  button = xfce_gtk_button_new_mixed ("xfburn-blank-cdrw", _("_Blank"));
 164    gtk_widget_show (button);
 165    gtk_dialog_add_action_widget (GTK_DIALOG (obj), button, GTK_RESPONSE_OK);
 166    GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
 167 --- xfburn-0.4.3/xfburn/xfburn-blank-dialog.h~  2009-10-24 23:18:10.000000000 +0200
 168 +++ xfburn-0.4.3/xfburn/xfburn-blank-dialog.h   2011-02-26 21:17:54.580716604 +0100
 169 @@ -26,6 +26,7 @@
 170  #include "xfburn-global.h"
 171
 172  #include <gtk/gtk.h>
 173 +#include <libxfce4ui/libxfce4ui.h>
 174
 175  G_BEGIN_DECLS
 176
 177 diff -ur xfburn-0.4.3/xfburn/xfburn-burn-audio-cd-composition-dialog.c xfburn-0.4.3-4ui/xfburn/xfburn-burn-audio-cd-composition-dialog.c
 178 --- xfburn-0.4.3/xfburn/xfburn-burn-audio-cd-composition-dialog.c       2009-10-30 02:10:13.000000000 +0100
 179 +++ xfburn-0.4.3-4ui/xfburn/xfburn-burn-audio-cd-composition-dialog.c   2011-02-26 20:14:58.426013553 +0100
 180 @@ -156,7 +156,7 @@
 181    g_signal_connect (G_OBJECT (priv->device_box), "volume-changed", G_CALLBACK (cb_volume_changed), obj);
 182    gtk_widget_show (priv->device_box);
 183
 184 -  priv->frame_device = xfce_create_framebox_with_content (_("Burning device"), priv->device_box);
 185 +  priv->frame_device = xfce_gtk_frame_box_new_with_content (_("Burning device"), priv->device_box);
 186    gtk_widget_show (priv->frame_device);
 187    gtk_box_pack_start (box, priv->frame_device, FALSE, FALSE, BORDER);
 188
 189 @@ -168,7 +168,7 @@
 190      vbox = gtk_vbox_new (FALSE, 0);
 191      gtk_widget_show (vbox);
 192
 193 -    frame = xfce_create_framebox_with_content (_("Composition name"), vbox);
 194 +    frame = xfce_gtk_frame_box_new_with_content (_("Composition name"), vbox);
 195      gtk_widget_show (frame);
 196      gtk_box_pack_start (box, frame, FALSE, FALSE, BORDER);
 197
 198 @@ -190,7 +190,7 @@
 199    vbox = gtk_vbox_new (FALSE, 0);
 200    gtk_widget_show (vbox);
 201
 202 -  frame = xfce_create_framebox_with_content (_("Options"), vbox);
 203 +  frame = xfce_gtk_frame_box_new_with_content (_("Options"), vbox);
 204    gtk_widget_show (frame);
 205    gtk_box_pack_start (box, frame, FALSE, FALSE, BORDER);
 206
 207 @@ -218,7 +218,7 @@
 208    gtk_widget_show (button);
 209    gtk_dialog_add_action_widget (GTK_DIALOG (obj), button, GTK_RESPONSE_CANCEL);
 210
 211 -  priv->button_proceed = button = xfce_create_mixed_button ("xfburn-burn-cd", _("_Burn Composition"));
 212 +  priv->button_proceed = button = xfce_gtk_button_new_mixed ("xfburn-burn-cd", _("_Burn Composition"));
 213
 214    gtk_widget_show (button);
 215    gtk_dialog_add_action_widget (GTK_DIALOG (obj), button, GTK_RESPONSE_OK);
 216 diff -ur xfburn-0.4.3/xfburn/xfburn-burn-audio-cd-composition-dialog.h xfburn-0.4.3-4ui/xfburn/xfburn-burn-audio-cd-composition-dialog.h
 217 --- xfburn-0.4.3/xfburn/xfburn-burn-audio-cd-composition-dialog.h       2009-10-24 23:18:10.000000000 +0200
 218 +++ xfburn-0.4.3-4ui/xfburn/xfburn-burn-audio-cd-composition-dialog.h   2011-02-26 16:21:06.852320585 +0100
 219 @@ -24,7 +24,7 @@
 220  #endif /* !HAVE_CONFIG_H */
 221
 222  #include <gtk/gtk.h>
 223 -#include <libxfcegui4/libxfcegui4.h>
 224 +#include <libxfce4ui/libxfce4ui.h>
 225
 226  #include <libisofs.h>
 227
 228 diff -ur xfburn-0.4.3/xfburn/xfburn-burn-data-cd-composition-dialog.h xfburn-0.4.3-4ui/xfburn/xfburn-burn-data-cd-composition-dialog.h
 229 --- xfburn-0.4.3/xfburn/xfburn-burn-data-cd-composition-dialog.h        2009-10-24 23:18:10.000000000 +0200
 230 +++ xfburn-0.4.3-4ui/xfburn/xfburn-burn-data-cd-composition-dialog.h    2011-02-26 16:21:06.854320585 +0100
 231 @@ -24,7 +24,7 @@
 232  #endif /* !HAVE_CONFIG_H */
 233
 234  #include <gtk/gtk.h>
 235 -#include <libxfcegui4/libxfcegui4.h>
 236 +#include <libxfce4ui/libxfce4ui.h>
 237
 238  #include <libisofs.h>
 239  #include "xfburn-burn-data-composition-base-dialog.h"
 240 diff -ur xfburn-0.4.3/xfburn/xfburn-burn-data-composition-base-dialog.c xfburn-0.4.3-4ui/xfburn/xfburn-burn-data-composition-base-dialog.c
 241 --- xfburn-0.4.3/xfburn/xfburn-burn-data-composition-base-dialog.c      2009-10-30 02:11:13.000000000 +0100
 242 +++ xfburn-0.4.3-4ui/xfburn/xfburn-burn-data-composition-base-dialog.c  2011-02-26 20:14:13.313013558 +0100
 243 @@ -192,7 +192,7 @@
 244
 245    g_signal_connect (G_OBJECT (priv->device_box), "volume-changed", G_CALLBACK (cb_volume_changed), obj);
 246
 247 -  priv->frame_device = xfce_create_framebox_with_content (_("Burning device"), priv->device_box);
 248 +  priv->frame_device = xfce_gtk_frame_box_new_with_content (_("Burning device"), priv->device_box);
 249    gtk_widget_show (priv->frame_device);
 250    gtk_box_pack_start (box, priv->frame_device, FALSE, FALSE, BORDER);
 251
 252 @@ -203,7 +203,7 @@
 253      vbox = gtk_vbox_new (FALSE, 0);
 254      gtk_widget_show (vbox);
 255
 256 -    frame = xfce_create_framebox_with_content (_("Composition name"), vbox);
 257 +    frame = xfce_gtk_frame_box_new_with_content (_("Composition name"), vbox);
 258      gtk_widget_show (frame);
 259      gtk_box_pack_start (box, frame, FALSE, FALSE, BORDER);
 260
 261 @@ -224,7 +224,7 @@
 262    vbox = gtk_vbox_new (FALSE, 0);
 263    gtk_widget_show (vbox);
 264
 265 -  frame = xfce_create_framebox_with_content (_("Options"), vbox);
 266 +  frame = xfce_gtk_frame_box_new_with_content (_("Options"), vbox);
 267    gtk_widget_show (frame);
 268    gtk_box_pack_start (box, frame, FALSE, FALSE, BORDER);
 269
 270 @@ -280,7 +280,7 @@
 271    gtk_widget_show (button);
 272    gtk_dialog_add_action_widget (GTK_DIALOG (obj), button, GTK_RESPONSE_CANCEL);
 273
 274 -  priv->button_proceed = button = xfce_create_mixed_button ("xfburn-burn-cd", _("_Burn Composition"));
 275 +  priv->button_proceed = button = xfce_gtk_button_new_mixed ("xfburn-burn-cd", _("_Burn Composition"));
 276    /*
 277     * Disabled: change button_proceed functionality
 278    button = create_proceed_button (obj, "xfburn-burn-cd", "");
 279 @@ -650,7 +650,7 @@
 280
 281      if (iso_image_create_burn_source (priv->image, write_opts, &src) < 0) {
 282        /* could not create source */
 283 -      xfce_err (_("Could not create ISO source structure."));
 284 +      xfce_dialog_show_error (NULL, NULL, _("Could not create ISO source structure."));
 285        return;
 286      }
 287
 288 diff -ur xfburn-0.4.3/xfburn/xfburn-burn-data-composition-base-dialog.h xfburn-0.4.3-4ui/xfburn/xfburn-burn-data-composition-base-dialog.h
 289 --- xfburn-0.4.3/xfburn/xfburn-burn-data-composition-base-dialog.h      2009-10-24 23:18:10.000000000 +0200
 290 +++ xfburn-0.4.3-4ui/xfburn/xfburn-burn-data-composition-base-dialog.h  2011-02-26 16:21:06.856320585 +0100
 291 @@ -24,7 +24,7 @@
 292  #endif /* !HAVE_CONFIG_H */
 293
 294  #include <gtk/gtk.h>
 295 -#include <libxfcegui4/libxfcegui4.h>
 296 +#include <libxfce4ui/libxfce4ui.h>
 297
 298  #include <libisofs.h>
 299
 300 diff -ur xfburn-0.4.3/xfburn/xfburn-burn-data-dvd-composition-dialog.h xfburn-0.4.3-4ui/xfburn/xfburn-burn-data-dvd-composition-dialog.h
 301 --- xfburn-0.4.3/xfburn/xfburn-burn-data-dvd-composition-dialog.h       2009-10-24 23:18:10.000000000 +0200
 302 +++ xfburn-0.4.3-4ui/xfburn/xfburn-burn-data-dvd-composition-dialog.h   2011-02-26 16:21:06.857320585 +0100
 303 @@ -24,7 +24,7 @@
 304  #endif /* !HAVE_CONFIG_H */
 305
 306  #include <gtk/gtk.h>
 307 -#include <libxfcegui4/libxfcegui4.h>
 308 +#include <libxfce4ui/libxfce4ui.h>
 309
 310  #include <libisofs.h>
 311  #include "xfburn-burn-data-composition-base-dialog.h"
 312 diff -ur xfburn-0.4.3/xfburn/xfburn-burn-image-dialog.c xfburn-0.4.3-4ui/xfburn/xfburn-burn-image-dialog.c
 313 --- xfburn-0.4.3/xfburn/xfburn-burn-image-dialog.c      2009-10-30 03:47:20.000000000 +0100
 314 +++ xfburn-0.4.3-4ui/xfburn/xfburn-burn-image-dialog.c  2011-02-26 20:14:24.039013553 +0100
 315 @@ -173,7 +173,7 @@
 316    gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (priv->chooser_image), filter);
 317    gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (priv->chooser_image), filter);
 318
 319 -  frame = xfce_create_framebox_with_content (_("Image to burn"), priv->chooser_image);
 320 +  frame = xfce_gtk_frame_box_new_with_content (_("Image to burn"), priv->chooser_image);
 321    gtk_widget_show (frame);
 322    gtk_box_pack_start (box, frame, FALSE, FALSE, BORDER);
 323
 324 @@ -188,7 +188,7 @@
 325    priv->device_box = xfburn_device_box_new (SHOW_CD_WRITERS | SHOW_CDRW_WRITERS | SHOW_DVD_WRITERS | SHOW_MODE_SELECTION | SHOW_SPEED_SELECTION);
 326    gtk_widget_show (priv->device_box);
 327
 328 -  frame = xfce_create_framebox_with_content (_("Burning device"), priv->device_box);
 329 +  frame = xfce_gtk_frame_box_new_with_content (_("Burning device"), priv->device_box);
 330    gtk_widget_show (frame);
 331    gtk_box_pack_start (box, frame, FALSE, FALSE, BORDER);
 332
 333 @@ -196,7 +196,7 @@
 334    vbox = gtk_vbox_new (FALSE, 0);
 335    gtk_widget_show (vbox);
 336
 337 -  frame = xfce_create_framebox_with_content (_("Options"), vbox);
 338 +  frame = xfce_gtk_frame_box_new_with_content (_("Options"), vbox);
 339    gtk_widget_show (frame);
 340    gtk_box_pack_start (box, frame, FALSE, FALSE, BORDER);
 341
 342 @@ -219,7 +219,7 @@
 343    gtk_widget_show (button);
 344    gtk_dialog_add_action_widget (GTK_DIALOG (obj), button, GTK_RESPONSE_CANCEL);
 345
 346 -  priv->burn_button = xfce_create_mixed_button ("xfburn-burn-cd", _("_Burn image"));
 347 +  priv->burn_button = xfce_gtk_button_new_mixed ("xfburn-burn-cd", _("_Burn image"));
 348    gtk_widget_show (priv->burn_button);
 349    g_signal_connect (G_OBJECT (priv->burn_button), "clicked", G_CALLBACK (cb_clicked_ok), obj);
 350    gtk_container_add (GTK_CONTAINER( GTK_DIALOG(obj)->action_area), priv->burn_button);
 351 @@ -400,7 +400,7 @@
 352  void
 353  burn_image_dialog_error (XfburnBurnImageDialog * dialog, const gchar * msg_error)
 354  {
 355 -  xfce_err (msg_error);
 356 +  xfce_dialog_show_error (NULL, NULL, msg_error);
 357  }
 358
 359  static void
 360 diff -ur xfburn-0.4.3/xfburn/xfburn-burn-image-dialog.h xfburn-0.4.3-4ui/xfburn/xfburn-burn-image-dialog.h
 361 --- xfburn-0.4.3/xfburn/xfburn-burn-image-dialog.h      2009-10-24 23:18:10.000000000 +0200
 362 +++ xfburn-0.4.3-4ui/xfburn/xfburn-burn-image-dialog.h  2011-02-26 16:21:06.859320585 +0100
 363 @@ -25,7 +25,7 @@
 364
 365  #include <gtk/gtk.h>
 366
 367 -#include <libxfcegui4/libxfcegui4.h>
 368 +#include <libxfce4ui/libxfce4ui.h>
 369
 370  #include "xfburn-global.h"
 371
 372 diff -ur xfburn-0.4.3/xfburn/xfburn-copy-cd-dialog.h xfburn-0.4.3-4ui/xfburn/xfburn-copy-cd-dialog.h
 373 --- xfburn-0.4.3/xfburn/xfburn-copy-cd-dialog.h 2009-10-24 23:18:10.000000000 +0200
 374 +++ xfburn-0.4.3-4ui/xfburn/xfburn-copy-cd-dialog.h     2011-02-26 16:21:06.866320585 +0100
 375 @@ -25,7 +25,7 @@
 376
 377  #include <gtk/gtk.h>
 378
 379 -#include <libxfcegui4/libxfcegui4.h>
 380 +#include <libxfce4ui/libxfce4ui.h>
 381
 382  G_BEGIN_DECLS
 383
 384 diff -ur xfburn-0.4.3/xfburn/xfburn-copy-dvd-dialog.h xfburn-0.4.3-4ui/xfburn/xfburn-copy-dvd-dialog.h
 385 --- xfburn-0.4.3/xfburn/xfburn-copy-dvd-dialog.h        2009-10-24 23:18:10.000000000 +0200
 386 +++ xfburn-0.4.3-4ui/xfburn/xfburn-copy-dvd-dialog.h    2011-02-26 16:21:06.869320585 +0100
 387 @@ -25,7 +25,7 @@
 388
 389  #include <gtk/gtk.h>
 390
 391 -#include <libxfcegui4/libxfcegui4.h>
 392 +#include <libxfce4ui/libxfce4ui.h>
 393
 394  G_BEGIN_DECLS
 395
 396 diff -ur xfburn-0.4.3/xfburn/xfburn-data-composition.c xfburn-0.4.3-4ui/xfburn/xfburn-data-composition.c
 397 --- xfburn-0.4.3/xfburn/xfburn-data-composition.c       2011-02-26 20:25:11.177013553 +0100
 398 +++ xfburn-0.4.3-4ui/xfburn/xfburn-data-composition.c   2011-02-26 20:11:15.445153553 +0100
 399 @@ -35,7 +35,7 @@
 400
 401  #include <gtk/gtk.h>
 402  #include <libxfce4util/libxfce4util.h>
 403 -#include <libxfcegui4/libxfcegui4.h>
 404 +#include <libxfce4ui/libxfce4ui.h>
 405
 406  #include <gio/gio.h>
 407
 408 @@ -671,7 +671,7 @@
 409    GtkTreePath *real_path;
 410
 411    if (strlen (newtext) == 0) {
 412 -    xfce_err (_("You must give a name to the file."));
 413 +    xfce_dialog_show_error (NULL, NULL, _("You must give a name to the file."));
 414      return;
 415    }
 416
 417 @@ -680,7 +680,7 @@
 418
 419    if (gtk_tree_model_get_iter (model, &iter, real_path)) {
 420      if (file_exists_on_same_level (model, real_path, TRUE, newtext)) {
 421 -      xfce_err (_("A file with the same name is already present in the composition."));
 422 +      xfce_dialog_show_error (NULL, NULL, _("A file with the same name is already present in the composition."));
 423      }
 424      else {
 425        gtk_tree_store_set (GTK_TREE_STORE (model), &iter, DATA_COMPOSITION_COLUMN_CONTENT, newtext, -1);
 426 @@ -1116,7 +1116,7 @@
 427
 428      gdk_threads_enter ();
 429      if (file_exists_on_same_level (model, tree_path, FALSE, name)) {
 430 -      xfce_err (_("A file with the same name is already present in the composition."));
 431 +      xfce_dialog_show_error (NULL, NULL, _("A file with the same name is already present in the composition."));
 432
 433        gtk_tree_path_free (tree_path);
 434        gdk_threads_leave ();
 435 @@ -1195,7 +1195,7 @@
 436
 437        if (s.st_size > MAXIMUM_ISO_FILE_SIZE) {
 438          gdk_threads_enter ();
 439 -        xfce_err (_("%s cannot be added to the composition, because it exceeds the maximum allowed file size for iso9660."), path);
 440 +        xfce_dialog_show_error (NULL, NULL, _("%s cannot be added to the composition, because it exceeds the maximum allowed file size for iso9660."), path);
 441          gdk_threads_leave ();
 442
 443          return FALSE;
 444 @@ -1448,7 +1448,7 @@
 445        }
 446
 447        if (file_exists_on_same_level (model, path_level, FALSE, name)) {
 448 -        xfce_warn (_("A file named \"%s\" already exists in this directory, the file hasn't been added."), name);
 449 +       xfce_dialog_show_warning(NULL, NULL, _("A file named \"%s\" already exists in this directory, the file hasn't been added."), name);
 450          goto cleanup;
 451        }
 452
 453 @@ -1861,7 +1861,7 @@
 454
 455          if (r == 0) {
 456            /* The first string is the renamed name, the second one the original name */
 457 -          xfce_warn (_("Duplicate filename '%s' for '%s'"), name, src);
 458 +         xfce_dialog_show_warning(NULL, NULL, _("Duplicate filename '%s' for '%s'"), name, src);
 459
 460            g_free (basename);
 461            g_free (name);
 462 diff -ur xfburn-0.4.3/xfburn/xfburn-data-disc-usage.c xfburn-0.4.3-4ui/xfburn/xfburn-data-disc-usage.c
 463 --- xfburn-0.4.3/xfburn/xfburn-data-disc-usage.c        2009-10-24 23:18:10.000000000 +0200
 464 +++ xfburn-0.4.3-4ui/xfburn/xfburn-data-disc-usage.c    2011-02-26 16:21:03.628320584 +0100
 465 @@ -22,7 +22,6 @@
 466
 467  #include <gtk/gtk.h>
 468  #include <libxfce4util/libxfce4util.h>
 469 -#include <libxfcegui4/libxfcegui4.h>
 470
 471  #include "xfburn-disc-usage.h"
 472  #include "xfburn-data-disc-usage.h"
 473 diff -ur xfburn-0.4.3/xfburn/xfburn-device-box.c xfburn-0.4.3-4ui/xfburn/xfburn-device-box.c
 474 --- xfburn-0.4.3/xfburn/xfburn-device-box.c     2011-02-26 20:25:11.178013553 +0100
 475 +++ xfburn-0.4.3-4ui/xfburn/xfburn-device-box.c 2011-02-26 16:21:03.642320584 +0100
 476 @@ -23,7 +23,6 @@
 477
 478  #include <gtk/gtk.h>
 479  #include <libxfce4util/libxfce4util.h>
 480 -#include <libxfcegui4/libxfcegui4.h>
 481
 482  #include "xfburn-device-list.h"
 483  #include "xfburn-device-box.h"
 484 diff -ur xfburn-0.4.3/xfburn/xfburn-directory-browser.c xfburn-0.4.3-4ui/xfburn/xfburn-directory-browser.c
 485 --- xfburn-0.4.3/xfburn/xfburn-directory-browser.c      2011-02-26 20:25:11.182013553 +0100
 486 +++ xfburn-0.4.3-4ui/xfburn/xfburn-directory-browser.c  2011-02-26 16:21:03.667320584 +0100
 487 @@ -26,7 +26,6 @@
 488
 489  #include <gtk/gtk.h>
 490  #include <libxfce4util/libxfce4util.h>
 491 -#include <libxfcegui4/libxfcegui4.h>
 492
 493  #include <gio/gio.h>
 494
 495 diff -ur xfburn-0.4.3/xfburn/xfburn-disc-usage.c xfburn-0.4.3-4ui/xfburn/xfburn-disc-usage.c
 496 --- xfburn-0.4.3/xfburn/xfburn-disc-usage.c     2009-10-24 23:18:10.000000000 +0200
 497 +++ xfburn-0.4.3-4ui/xfburn/xfburn-disc-usage.c 2011-02-26 20:14:37.314013551 +0100
 498 @@ -30,7 +30,7 @@
 499
 500  #include <gtk/gtk.h>
 501  #include <libxfce4util/libxfce4util.h>
 502 -#include <libxfcegui4/libxfcegui4.h>
 503 +#include <libxfce4ui/libxfce4ui.h>
 504
 505  #include "xfburn-disc-usage.h"
 506  #include "xfburn-global.h"
 507 @@ -160,7 +160,7 @@
 508    gtk_box_pack_start (GTK_BOX (disc_usage), disc_usage->combo, FALSE, FALSE, BORDER);
 509    gtk_widget_show (disc_usage->combo);
 510
 511 -  disc_usage->button = xfce_create_mixed_button (XFBURN_STOCK_BURN_CD, _("Proceed to Burn"));
 512 +  disc_usage->button = xfce_gtk_button_new_mixed (XFBURN_STOCK_BURN_CD, _("Proceed to Burn"));
 513    gtk_box_pack_start (GTK_BOX (disc_usage), disc_usage->button, FALSE, FALSE, BORDER);
 514    gtk_widget_set_sensitive (disc_usage->button, FALSE);
 515    gtk_widget_show (disc_usage->button);
 516 @@ -200,7 +200,7 @@
 517    if (du->size <= class->labels[gtk_combo_box_get_active (GTK_COMBO_BOX (du->combo))].size) {
 518      g_signal_emit (G_OBJECT (du), signals[BEGIN_BURN], 0);
 519    } else {
 520 -    xfce_err (_("You are trying to burn more onto the disc than it can hold."));
 521 +    xfce_dialog_show_error (NULL, NULL, _("You are trying to burn more onto the disc than it can hold."));
 522    }
 523  }
 524
 525 diff -ur xfburn-0.4.3/xfburn/xfburn-file-browser.c xfburn-0.4.3-4ui/xfburn/xfburn-file-browser.c
 526 --- xfburn-0.4.3/xfburn/xfburn-file-browser.c   2009-10-24 23:18:10.000000000 +0200
 527 +++ xfburn-0.4.3-4ui/xfburn/xfburn-file-browser.c       2011-02-26 16:21:03.678320584 +0100
 528 @@ -26,7 +26,6 @@
 529
 530  #include <gtk/gtk.h>
 531  #include <libxfce4util/libxfce4util.h>
 532 -#include <libxfcegui4/libxfcegui4.h>
 533
 534  #include "xfburn-file-browser.h"
 535  #include "xfburn-fs-browser.h"
 536 diff -ur xfburn-0.4.3/xfburn/xfburn-fs-browser.c xfburn-0.4.3-4ui/xfburn/xfburn-fs-browser.c
 537 --- xfburn-0.4.3/xfburn/xfburn-fs-browser.c     2009-10-24 23:18:10.000000000 +0200
 538 +++ xfburn-0.4.3-4ui/xfburn/xfburn-fs-browser.c 2011-02-26 16:21:03.684320584 +0100
 539 @@ -24,7 +24,6 @@
 540  #include <string.h>
 541  #endif
 542
 543 -#include <libxfcegui4/libxfcegui4.h>
 544  #include <libxfce4util/libxfce4util.h>
 545
 546  #include "xfburn-fs-browser.h"
 547 diff -ur xfburn-0.4.3/xfburn/xfburn-main.c xfburn-0.4.3-4ui/xfburn/xfburn-main.c
 548 --- xfburn-0.4.3/xfburn/xfburn-main.c   2011-02-26 20:25:11.186013553 +0100
 549 +++ xfburn-0.4.3-4ui/xfburn/xfburn-main.c       2011-02-26 20:10:39.291239575 +0100
 550 @@ -29,7 +29,7 @@
 551  #include <gtk/gtk.h>
 552
 553  #include <libxfce4util/libxfce4util.h>
 554 -#include <libxfcegui4/libxfcegui4.h>
 555 +#include <libxfce4ui/libxfce4ui.h>
 556
 557  #ifdef HAVE_GST
 558  #include <gst/gst.h>
 559 @@ -217,7 +217,7 @@
 560
 561    if (!burn_initialize ()) {
 562      g_critical ("Unable to initialize libburn");
 563 -    xfce_err (_("Unable to initialize the burning backend."));
 564 +    xfce_dialog_show_error (NULL, NULL, _("Unable to initialize the burning backend."));
 565      gdk_threads_leave ();
 566      return EXIT_FAILURE;
 567    }
 568 @@ -274,7 +274,7 @@
 569  #ifdef HAVE_GUDEV
 570    error_msg = xfburn_udev_manager_create_global ();
 571    if (error_msg) {
 572 -    xfce_err (error_msg);
 573 +    xfce_dialog_show_error (NULL, NULL, error_msg);
 574      gdk_threads_leave ();
 575      burn_finish ();
 576      return EXIT_FAILURE;
 577 @@ -328,7 +328,7 @@
 578    }
 579
 580    if (!xfburn_transcoder_is_initialized (transcoder, &error)) {
 581 -    xfce_warn (_("Failed to initialize %s transcoder: %s\n\t(falling back to basic implementation)"), xfburn_transcoder_get_name (transcoder), error->message);
 582 +    xfce_dialog_show_warning(NULL, NULL, _("Failed to initialize %s transcoder: %s\n\t(falling back to basic implementation)"), xfburn_transcoder_get_name (transcoder), error->message);
 583      g_error_free (error);
 584      g_object_unref (transcoder);
 585      transcoder = XFBURN_TRANSCODER (xfburn_transcoder_basic_new ());
 586 @@ -361,7 +361,7 @@
 587        if (g_file_test (image_fullname, G_FILE_TEST_EXISTS))
 588         xfburn_burn_image_dialog_set_filechooser_name (dialog, image_fullname);
 589        else
 590 -       xfce_err ( g_strdup_printf ( _("Image file '%s' does not exist."), image_fullname));
 591 +        xfce_dialog_show_error (NULL, NULL, g_strdup_printf ( _("Image file '%s' does not exist."), image_fullname));
 592      }
 593
 594      gtk_dialog_run (GTK_DIALOG (dialog));
 595 diff -ur xfburn-0.4.3/xfburn/xfburn-main-window.c xfburn-0.4.3-4ui/xfburn/xfburn-main-window.c
 596 --- xfburn-0.4.3/xfburn/xfburn-main-window.c    2009-12-04 08:35:12.000000000 +0100
 597 +++ xfburn-0.4.3-4ui/xfburn/xfburn-main-window.c        2011-02-26 20:22:57.325013554 +0100
 598 @@ -22,7 +22,7 @@
 599
 600  #include <gtk/gtk.h>
 601  #include <libxfce4util/libxfce4util.h>
 602 -#include <libxfcegui4/libxfcegui4.h>
 603 +#include <libxfce4ui/libxfce4ui.h>
 604
 605  #include <exo/exo.h>
 606
 607 @@ -479,79 +479,69 @@
 608  static void
 609  action_about (GtkAction * action, XfburnMainWindow * window)
 610  {
 611 -  XfceAboutInfo *info;
 612 -  GtkWidget *dialog;
 613    gint x, y;
 614 -  GdkPixbuf *icon;
 615 -  guint n;
 616 -
 617 -  static const struct
 618 -  {
 619 -    gchar *name, *email, *language;
 620 -  } translators[] = {
 621 -    {"Mohamed Magdy", "mohamed.m.k@gmail.com", "ar",},
 622 -    {"Pau Rul lan Ferragut", "paurullan@bulma.net", "ca",},
 623 -    {"Michal Várady", "miko.vaji@gmail.com", "cs",},
 624 -    {"Enrico Tröger", "enrico.troeger@uvena.de", "de",},
 625 -    {"Fabian Nowak", "timstery@arcor.de", "de",},
 626 -    {"Nico Schümann", "nico@prog.nico22.de", "de",},
 627 -    {"Stavros Giannouris", "stavrosg2002@freemail.gr", "el",},
 628 -    {"Jeff Bailes", "thepizzaking@gmail.com", "en_GB",},
 629 -    {"Diego Rodriguez", "dieymir@yahoo.es", "es",},
 630 -    {"Kristjan Siimson", "kristjan.siimson@gmail.com", "et",},
 631 -    {"Piarres Beobide", "pi@beobide.net", "eu",},
 632 -    {"Jari Rahkonen", "jari.rahkonen@pp1.inet.fi", "fi",},
 633 -    {"Etienne Collet", "xanaxlnx@gmail.com", "fr",},
 634 -    {"Maximilian Schleiss", "maximilian@xfce.org", "fr",},
 635 -    {"Attila Szervác", "sas@321.hu", "hu",},
 636 -    {"Daichi Kawahata", "daichi@xfce.org", "ja",},
 637 -    {"ByungHyun Choi", "byunghyun.choi@debianusers.org", "kr",},
 638 -    {"Mantas", "mantaz@users.sourceforge.net", "lt",},
 639 -    {"Rihards Prieditis", "RPrieditis@inbox.lv", "lv",},
 640 -    {"Terje Uriansrud", "ter@operamail.com", "nb_NO",},
 641 -    {"Stephan Arts", "psybsd@gmail.com", "nl",},
 642 -    {"Szymon Kałasz", "szymon_maestro@gazeta.pl", "pl",},
 643 -    {"Fábio Nogueira", "deb-user-ba@ubuntu.com", "pt_BR",},
 644 -    {"Og Maciel", "omaciel@xfce.org", "pt_BR",},
 645 -    {"Nuno Miguel", "nunis@netcabo.pt", "pt_PT",},
 646 -    {"Sergey Fedoseev", "fedoseev.sergey@gmail.com", "ru",},
 647 -    {"Besnik Bleta", "besnik@programeshqip.org", "sq",},
 648 -    {"Maxim V. Dziumanenko", "mvd@mylinux.com.ua", "uk",},
 649 -    {"Dmitry Nikitin", "", "uk",},
 650 -    {"ﻢﺤﻣﺩ ﻊﻠﻳ ﺎﻠﻤﻜﻳ", "makki.ma@gmail.com", "ur",},
 651 -    {"正龙 赵", "longer.zhao@gmail.com", "zh_CN",},
 652 -    {"Cosmo Chene", "cosmolax@gmail.com", "zh_TW",},
 653 -  };
 654 +  GdkPixbuf *icon = NULL;
 655 +  const gchar *auth[] = { "David Mohr david@mcbf.net Author/Maintainer",
 656 +                         "Mario Đanić mario@libburnia-project.org Author/Maintainer",
 657 +                         "Jean-François Wauthy pollux@xfce.org Retired author/maintainer",
 658 +                         NULL };
 659 +  const gchar *translators =
 660 +    "Mohamed Magdy mohamed.m.k@gmail.com ar\n"
 661 +    "Pau Rul lan Ferragut paurullan@bulma.net ca\n"
 662 +    "Michal Várady miko.vaji@gmail.com cs\n"
 663 +    "Enrico Tröger enrico.troeger@uvena.de de\n"
 664 +    "Fabian Nowak timstery@arcor.de de\n"
 665 +    "Nico Schümann nico@prog.nico22.de de\n"
 666 +    "Stavros Giannouris stavrosg2002@freemail.gr el\n"
 667 +    "Jeff Bailes thepizzaking@gmail.com en_GB\n"
 668 +    "Diego Rodriguez dieymir@yahoo.es es\n"
 669 +    "Kristjan Siimson kristjan.siimson@gmail.com et\n"
 670 +    "Piarres Beobide pi@beobide.net eu\n"
 671 +    "Jari Rahkonen jari.rahkonen@pp1.inet.fi fi\n"
 672 +    "Etienne Collet xanaxlnx@gmail.com fr\n"
 673 +    "Maximilian Schleiss maximilian@xfce.org fr\n"
 674 +    "Attila Szervác sas@321.hu hu\n"
 675 +    "Daichi Kawahata daichi@xfce.org ja\n"
 676 +    "ByungHyun Choi byunghyun.choi@debianusers.org kr\n"
 677 +    "Mantas mantaz@users.sourceforge.net lt\n"
 678 +    "Rihards Prieditis RPrieditis@inbox.lv lv\n"
 679 +    "Terje Uriansrud ter@operamail.com nb_NO\n"
 680 +    "Stephan Arts psybsd@gmail.com nl\n"
 681 +    "Szymon Kałasz szymon_maestro@gazeta.pl pl\n"
 682 +    "Fábio Nogueira deb-user-ba@ubuntu.com pt_BR\n"
 683 +    "Og Maciel omaciel@xfce.org pt_BR\n"
 684 +    "Nuno Miguel nunis@netcabo.pt pt_PT\n"
 685 +    "Sergey Fedoseev fedoseev.sergey@gmail.com ru\n"
 686 +    "Besnik Bleta besnik@programeshqip.org sq\n"
 687 +    "Maxim V. Dziumanenko mvd@mylinux.com.ua uk\n"
 688 +    "Dmitry Nikitin  uk\n"
 689 +    "ﻢﺤﻣﺩ ﻊﻠﻳ ﺎﻠﻤﻜﻳ makki.ma@gmail.com ur\n"
 690 +    "正龙 赵 longer.zhao@gmail.com zh_CN\n"
 691 +    "Cosmo Chene cosmolax@gmail.com zh_TW\n";
 692
 693    gtk_icon_size_lookup (GTK_ICON_SIZE_DIALOG, &x, &y);
 694 -  icon = xfce_themed_icon_load ("media-optical", x);
 695 +  icon = gtk_icon_theme_load_icon ( gtk_icon_theme_get_default(), "media-optical", x, GTK_ICON_LOOKUP_GENERIC_FALLBACK, NULL);
 696    if (!icon)
 697 -    icon = xfce_themed_icon_load ("media-cdrom", x);
 698 +    icon = gtk_icon_theme_load_icon ( gtk_icon_theme_get_default(), "media-cdrom", x, GTK_ICON_LOOKUP_GENERIC_FALLBACK, NULL);
 699    if (!icon)
 700 -    icon = xfce_themed_icon_load (GTK_STOCK_CDROM, x);
 701 -
 702 -  info = xfce_about_info_new ("Xfburn", VERSION, _("Another cd burning GUI"),
 703 -                              XFCE_COPYRIGHT_TEXT ("2005-2008", "David Mohr, Mario Đanić, Jean-François Wauthy"), XFCE_LICENSE_GPL);
 704 -  xfce_about_info_set_homepage (info, "http://www.xfce.org/projects/xfburn");
 705 -  xfce_about_info_add_credit (info, "David Mohr", "david@mcbf.net", _("Author/Maintainer"));
 706 -  xfce_about_info_add_credit (info, "Mario Đanić", "mario@libburnia-project.org", _("Author/Maintainer"));
 707 -  xfce_about_info_add_credit (info, "Jean-François Wauthy", "pollux@xfce.org", _("Retired author/maintainer"));
 708 -
 709 -
 710 -  for (n = 0; n < G_N_ELEMENTS (translators); ++n) {
 711 -    gchar *s;
 712 +    icon = gtk_icon_theme_load_icon ( gtk_icon_theme_get_default(), GTK_STOCK_CDROM, x, GTK_ICON_LOOKUP_GENERIC_FALLBACK, NULL);
 713
 714 -    s = g_strdup_printf (_("Translator (%s)"), translators[n].language);
 715 -    xfce_about_info_add_credit (info, translators[n].name, translators[n].email, s);
 716 -    g_free (s);
 717 -  }
 718 -
 719 -  dialog = xfce_about_dialog_new_with_values (GTK_WINDOW (window), info, icon);
 720 -  gtk_widget_set_size_request (GTK_WIDGET (dialog), 400, 300);
 721 -  gtk_dialog_run (GTK_DIALOG (dialog));
 722 -  gtk_widget_destroy (dialog);
 723 +#if !GTK_CHECK_VERSION (2, 18, 0)
 724 +  gtk_about_dialog_set_email_hook (exo_gtk_url_about_dialog_hook, NULL, NULL);
 725 +  gtk_about_dialog_set_url_hook (exo_gtk_url_about_dialog_hook, NULL, NULL);
 726 +#endif
 727 +  gtk_show_about_dialog(GTK_WINDOW (window),
 728 +                 "logo", icon,
 729 +                 "program-name", "Xfburn",
 730 +                 "license", xfce_get_license_text (XFCE_LICENSE_TEXT_GPL),
 731 +                 "version", VERSION,
 732 +                 "comments", _("Another cd burning GUI"),
 733 +                 "website", "http://www.xfce.org/projects/xfburn",
 734 +                 "copyright", "2005-2008 David Mohr, Mario Đanić, Jean-François Wauthy",
 735 +                 "authors", auth,
 736 +                 "translator-credits", translators,
 737 +                 NULL);
 738
 739 -  xfce_about_info_free (info);
 740    if (G_LIKELY (icon != NULL))
 741      g_object_unref (G_OBJECT (icon));
 742  }
 743 diff -ur xfburn-0.4.3/xfburn/xfburn-perform-burn.h xfburn-0.4.3-4ui/xfburn/xfburn-perform-burn.h
 744 --- xfburn-0.4.3/xfburn/xfburn-perform-burn.h   2009-10-30 02:07:24.000000000 +0100
 745 +++ xfburn-0.4.3-4ui/xfburn/xfburn-perform-burn.h       2011-02-26 16:21:06.901320585 +0100
 746 @@ -25,7 +25,7 @@
 747  #endif
 748
 749  #include <gtk/gtk.h>
 750 -#include <libxfcegui4/libxfcegui4.h>
 751 +#include <libxfce4ui/libxfce4ui.h>
 752
 753  #include <libburn.h>
 754
 755 diff -ur xfburn-0.4.3/xfburn/xfburn-preferences-dialog.c xfburn-0.4.3-4ui/xfburn/xfburn-preferences-dialog.c
 756 --- xfburn-0.4.3/xfburn/xfburn-preferences-dialog.c     2009-10-24 23:18:10.000000000 +0200
 757 +++ xfburn-0.4.3-4ui/xfburn/xfburn-preferences-dialog.c 2011-02-26 20:18:38.177013556 +0100
 758 @@ -20,7 +20,7 @@
 759  #include <config.h>
 760  #endif /* !HAVE_CONFIG_H */
 761
 762 -#include <libxfcegui4/libxfcegui4.h>
 763 +#include <libxfce4ui/libxfce4ui.h>
 764  #include <exo/exo.h>
 765
 766  #include "xfburn-preferences-dialog.h"
 767 @@ -185,7 +185,7 @@
 768    vbox2 = gtk_vbox_new (FALSE, 0);
 769    gtk_widget_show (vbox2);
 770
 771 -  frame = xfce_create_framebox_with_content (_("Temporary directory"), vbox2);
 772 +  frame = xfce_gtk_frame_box_new_with_content (_("Temporary directory"), vbox2);
 773    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, BORDER);
 774    gtk_widget_show (frame);
 775
 776 @@ -200,7 +200,7 @@
 777    vbox2 = gtk_vbox_new (FALSE, 0);
 778    gtk_widget_show (vbox2);
 779
 780 -  frame = xfce_create_framebox_with_content (_("File browser"), vbox2);
 781 +  frame = xfce_gtk_frame_box_new_with_content (_("File browser"), vbox2);
 782    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, BORDER);
 783    gtk_widget_show (frame);
 784
 785 @@ -240,7 +240,7 @@
 786    vbox2 = gtk_vbox_new (FALSE, 0);
 787    gtk_widget_show (vbox2);
 788
 789 -  frame = xfce_create_framebox_with_content (_("Detected devices"), vbox2);
 790 +  frame = xfce_gtk_frame_box_new_with_content (_("Detected devices"), vbox2);
 791    gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, BORDER);
 792    gtk_widget_show (frame);
 793
 794 @@ -292,17 +292,17 @@
 795    gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, BORDER);
 796    gtk_widget_show (hbox);
 797
 798 -  priv->button_scan = xfce_create_mixed_button (GTK_STOCK_CDROM, _("Sc_an for devices"));
 799 +  priv->button_scan = xfce_gtk_button_new_mixed (GTK_STOCK_CDROM, _("Sc_an for devices"));
 800    gtk_box_pack_end (GTK_BOX (hbox), priv->button_scan, FALSE, FALSE, BORDER);
 801    g_signal_connect (G_OBJECT (priv->button_scan), "clicked", G_CALLBACK (scan_button_clicked_cb), obj);
 802    gtk_widget_show (priv->button_scan);
 803
 804    gtk_icon_size_lookup (GTK_ICON_SIZE_DIALOG, &x, &y);
 805 -  icon = xfce_themed_icon_load ("media-optical", x);
 806 +  icon = gtk_icon_theme_load_icon ( gtk_icon_theme_get_default(), "media-optical", x, GTK_ICON_LOOKUP_GENERIC_FALLBACK, NULL);
 807    if (!icon)
 808 -    icon = xfce_themed_icon_load ("media-cdrom", x);
 809 +    icon = gtk_icon_theme_load_icon ( gtk_icon_theme_get_default(), "media-cdrom", x, GTK_ICON_LOOKUP_GENERIC_FALLBACK, NULL);
 810    if (!icon)
 811 -    icon = xfce_themed_icon_load (GTK_STOCK_CDROM, x);
 812 +    icon = gtk_icon_theme_load_icon ( gtk_icon_theme_get_default(), GTK_STOCK_CDROM, x, GTK_ICON_LOOKUP_GENERIC_FALLBACK, NULL);
 813
 814
 815    gtk_list_store_append (icon_store, &iter);
 816 @@ -326,7 +326,7 @@
 817    vbox3 = gtk_vbox_new (FALSE, 0);
 818    gtk_widget_show (vbox3);
 819
 820 -  frame = xfce_create_framebox_with_content (_("FIFO buffer size (in kb)"), vbox3);
 821 +  frame = xfce_gtk_frame_box_new_with_content (_("FIFO buffer size (in kb)"), vbox3);
 822    gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, BORDER);
 823    gtk_widget_show (frame);
 824
 825 @@ -460,7 +460,7 @@
 826  static void
 827  cb_show_hidden_clicked (GtkButton * Button, gpointer user_data)
 828  {
 829 -  xfce_warn (_("Changing this setting only takes full effect after a program restart."));
 830 +  xfce_dialog_show_warning(NULL, NULL, _("Changing this setting only takes full effect after a program restart."));
 831  }
 832
 833  /* public */
 834 diff -ur xfburn-0.4.3/xfburn/xfburn-progress-dialog.c xfburn-0.4.3-4ui/xfburn/xfburn-progress-dialog.c
 835 --- xfburn-0.4.3/xfburn/xfburn-progress-dialog.c        2009-10-24 23:18:10.000000000 +0200
 836 +++ xfburn-0.4.3-4ui/xfburn/xfburn-progress-dialog.c    2011-02-26 20:10:07.506140054 +0100
 837 @@ -30,7 +30,7 @@
 838
 839  #include <gtk/gtk.h>
 840
 841 -#include <libxfcegui4/libxfcegui4.h>
 842 +#include <libxfce4ui/libxfce4ui.h>
 843
 844  #include "xfburn-progress-dialog.h"
 845  #include "xfburn-global.h"
 846 @@ -603,7 +603,7 @@
 847    xfburn_progress_dialog_set_status_with_text (dialog, XFBURN_PROGRESS_DIALOG_STATUS_FAILED, _("Failure"));
 848
 849    gdk_threads_enter ();
 850 -  xfce_err (msg_error);
 851 +  xfce_dialog_show_error (NULL, NULL, msg_error);
 852    gdk_threads_leave ();
 853  }
 854
 855 diff -ur xfburn-0.4.3/xfburn/xfburn-transcoder-basic.c xfburn-0.4.3-4ui/xfburn/xfburn-transcoder-basic.c
 856 --- xfburn-0.4.3/xfburn/xfburn-transcoder-basic.c       2009-10-24 23:18:10.000000000 +0200
 857 +++ xfburn-0.4.3-4ui/xfburn/xfburn-transcoder-basic.c   2011-02-26 20:07:07.312282054 +0100
 858 @@ -33,7 +33,7 @@
 859  #include <errno.h>
 860
 861  #include <libxfce4util/libxfce4util.h>
 862 -#include <libxfcegui4/libxfcegui4.h>
 863 +#include <libxfce4ui/libxfce4ui.h>
 864
 865  #include <libburn.h>
 866
 867 @@ -235,7 +235,7 @@
 868    fd = open (path, 0);
 869
 870    if (fd == -1) {
 871 -    xfce_warn (_("Could not open %s."), path);
 872 +    xfce_dialog_show_warning(NULL, _("Could not open %s."), path);
 873      return FALSE;
 874    }
 875
 876 diff -ur xfburn-0.4.3/xfburn/xfburn-transcoder-gst.c xfburn-0.4.3-4ui/xfburn/xfburn-transcoder-gst.c
 877 --- xfburn-0.4.3/xfburn/xfburn-transcoder-gst.c 2009-10-24 23:18:10.000000000 +0200
 878 +++ xfburn-0.4.3-4ui/xfburn/xfburn-transcoder-gst.c     2011-02-26 16:21:03.773320584 +0100
 879 @@ -36,7 +36,6 @@
 880  #include <errno.h>
 881
 882  #include <libxfce4util/libxfce4util.h>
 883 -#include <libxfcegui4/libxfcegui4.h>
 884
 885  #include <libburn.h>
 886
 887 diff -ur xfburn-0.4.3/xfburn/xfburn-udev-manager.c xfburn-0.4.3-4ui/xfburn/xfburn-udev-manager.c
 888 --- xfburn-0.4.3/xfburn/xfburn-udev-manager.c   2011-02-26 20:25:11.187013553 +0100
 889 +++ xfburn-0.4.3-4ui/xfburn/xfburn-udev-manager.c       2011-02-26 19:59:29.621029555 +0100
 890 @@ -33,7 +33,7 @@
 891  #include <errno.h>
 892
 893  #include <libxfce4util/libxfce4util.h>
 894 -#include <libxfcegui4/libxfcegui4.h>
 895 +#include <libxfce4ui/libxfce4ui.h>
 896
 897  #include "xfburn-global.h"
 898  #include "xfburn-progress-dialog.h"
 899 @@ -514,7 +514,7 @@
 900    if (unmounted)
 901      g_message ("Unmounted '%s'", mp);
 902    else {
 903 -    xfce_err ("Failed to unmount '%s'. Drive cannot be used for burning.", mp);
 904 +    xfce_dialog_show_error (NULL, NULL, "Failed to unmount '%s'. Drive cannot be used for burning.", mp);
 905      DBG ("Failed to unmount '%s'", mp);
 906    }
 907