packages: xfburn/xfburn.spec, xfburn/xfburn-ui.patch (NEW) - libxfce4ui port
baggins
baggins at pld-linux.org
Sat Feb 26 20:34:50 CET 2011
Author: baggins Date: Sat Feb 26 19:34:50 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- libxfce4ui port
---- Files affected:
packages/xfburn:
xfburn.spec (1.19 -> 1.20) , xfburn-ui.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/xfburn/xfburn.spec
diff -u packages/xfburn/xfburn.spec:1.19 packages/xfburn/xfburn.spec:1.20
--- packages/xfburn/xfburn.spec:1.19 Sat Feb 26 15:14:22 2011
+++ packages/xfburn/xfburn.spec Sat Feb 26 20:34:45 2011
@@ -10,6 +10,7 @@
# Source0-md5: 147cdc2d909e751125be16103b8dc81f
Patch0: %{name}-po.patch
Patch1: %{name}-gio.patch
+Patch2: %{name}-ui.patch
URL: http://goodies.xfce.org/projects/applications/xfburn/
BuildRequires: Thunar-devel >= 1.2.0
BuildRequires: autoconf
@@ -52,6 +53,7 @@
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
# unsupported Urdu Pakistan dialect
%{__rm} po/ur_PK.po
@@ -102,6 +104,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.20 2011/02/26 19:34:45 baggins
+- libxfce4ui port
+
Revision 1.19 2011/02/26 14:14:22 baggins
- say googbye to HAL
================================================================
Index: packages/xfburn/xfburn-ui.patch
diff -u /dev/null packages/xfburn/xfburn-ui.patch:1.1
--- /dev/null Sat Feb 26 20:34:50 2011
+++ packages/xfburn/xfburn-ui.patch Sat Feb 26 20:34:45 2011
@@ -0,0 +1,896 @@
+diff -ur xfburn-0.4.3/configure.in xfburn-0.4.3-4ui/configure.in
+--- xfburn-0.4.3/configure.in 2011-02-26 20:25:11.173013553 +0100
++++ xfburn-0.4.3-4ui/configure.in 2011-02-26 19:16:30.409029549 +0100
+@@ -38,7 +38,7 @@
+ XDT_CHECK_PACKAGE([LIBISOFS], [libisofs-1], [0.6.2])
+ XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0])
+ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.10.0])
+-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
++XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
+ XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.4], [], [XDT_CHECK_PACKAGE([EXO], [exo-1], [0.3.100])])
+ XDT_CHECK_PACKAGE([LIBGIO], [gio-2.0], [2.22.0])
+ XDT_CHECK_PACKAGE([LIBGIOUNIX], [gio-unix-2.0], [2.16.0])
+diff -ur xfburn-0.4.3/xfburn/Makefile.am xfburn-0.4.3-4ui/xfburn/Makefile.am
+--- xfburn-0.4.3/xfburn/Makefile.am 2011-02-26 20:25:11.174013553 +0100
++++ xfburn-0.4.3-4ui/xfburn/Makefile.am 2011-02-26 19:17:52.972029553 +0100
+@@ -95,7 +95,7 @@
+ $(GTHREAD_CFLAGS) \
+ $(LIBBURN_CFLAGS) \
+ $(LIBISOFS_CFLAGS) \
+- $(LIBXFCEGUI4_CFLAGS) \
++ $(LIBXFCE4UI_CFLAGS) \
+ $(EXO_CFLAGS) \
+ $(GIO_CFLAGS) \
+ $(GIO_UNIX_CFLAGS) \
+@@ -106,7 +106,7 @@
+ $(GTHREAD_LIBS) \
+ $(LIBBURN_LIBS) \
+ $(LIBISOFS_LIBS) \
+- $(LIBXFCEGUI4_LIBS) \
++ $(LIBXFCE4UI_LIBS) \
+ $(EXO_LIBS) \
+ $(GIO_LIBS) \
+ $(GIO_UNIX_LIBS) \
+diff -ur xfburn-0.4.3/xfburn/xfburn-audio-composition.c xfburn-0.4.3-4ui/xfburn/xfburn-audio-composition.c
+--- xfburn-0.4.3/xfburn/xfburn-audio-composition.c 2011-02-26 20:25:11.175013553 +0100
++++ xfburn-0.4.3-4ui/xfburn/xfburn-audio-composition.c 2011-02-26 20:12:31.066324063 +0100
+@@ -32,7 +32,7 @@
+
+ #include <gtk/gtk.h>
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+
+ #include <gio/gio.h>
+
+@@ -577,7 +577,7 @@
+ dialog = xfburn_burn_audio_cd_composition_dialog_new (src);
+ break;
+ case DVD_DISC:
+- xfce_err (_("Cannot burn audio onto a DVD."));
++ xfce_dialog_show_error (NULL, NULL, _("Cannot burn audio onto a DVD."));
+ return;
+ break;
+ }
+@@ -1021,7 +1021,7 @@
+ {
+ XfburnAudioCompositionPrivate *priv = XFBURN_AUDIO_COMPOSITION_GET_PRIVATE (dc);
+
+- xfce_info (xfburn_transcoder_get_description (priv->trans));
++ xfce_dialog_show_info(NULL, NULL, xfburn_transcoder_get_description (priv->trans));
+ }
+
+ static void
+@@ -1089,14 +1089,14 @@
+ g_assert (error != NULL);
+
+ if (error->domain != XFBURN_ERROR) {
+- xfce_warn (error->message);
++ xfce_dialog_show_warning(NULL, NULL, error->message);
+ return;
+ }
+
+ if (g_hash_table_lookup (priv->warned_about, GINT_TO_POINTER (error->code)) == NULL) {
+ g_hash_table_insert (priv->warned_about, GINT_TO_POINTER (error->code), did_warn);
+
+- xfce_warn (error->message);
++ xfce_dialog_show_warning(NULL, NULL, error->message);
+ }
+ }
+
+@@ -1141,7 +1141,7 @@
+
+ gdk_threads_enter ();
+ if (file_exists_on_same_level (model, tree_path, FALSE, name)) {
+- xfce_err (_("A file with the same name is already present in the composition."));
++ xfce_dialog_show_error (NULL, NULL, _("A file with the same name is already present in the composition."));
+
+ gtk_tree_path_free (tree_path);
+ gdk_threads_leave ();
+@@ -1225,7 +1225,7 @@
+ if (g_hash_table_lookup (priv->warned_about, GINT_TO_POINTER (err_code)) == NULL) {
+ g_hash_table_insert (priv->warned_about, GINT_TO_POINTER (err_code), did_warn);
+ gdk_threads_enter ();
+- xfce_err (_("You can only have a maximum of 99 tracks."));
++ xfce_dialog_show_error (NULL, NULL, _("You can only have a maximum of 99 tracks."));
+ gdk_threads_leave ();
+ }
+
+@@ -1475,7 +1475,7 @@
+
+ /*
+ if (file_exists_on_same_level (model, path_level, FALSE, name)) {
+- xfce_warn (_("A file named \"%s\" already exists in this directory, the file hasn't been added."), name);
++ xfce_dialog_warning(NULL, _("A file named \"%s\" already exists in this directory, the file hasn't been added."), name);
+ goto cleanup;
+ }
+ */
+diff -ur xfburn-0.4.3/xfburn/xfburn-audio-disc-usage.c xfburn-0.4.3-4ui/xfburn/xfburn-audio-disc-usage.c
+--- xfburn-0.4.3/xfburn/xfburn-audio-disc-usage.c 2009-10-24 23:18:10.000000000 +0200
++++ xfburn-0.4.3-4ui/xfburn/xfburn-audio-disc-usage.c 2011-02-26 16:21:03.534320584 +0100
+@@ -22,7 +22,6 @@
+
+ #include <gtk/gtk.h>
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/libxfcegui4.h>
+
+ #include "xfburn-disc-usage.h"
+ #include "xfburn-audio-disc-usage.h"
+diff -ur xfburn-0.4.3/xfburn/xfburn-blank-dialog.c xfburn-0.4.3-4ui/xfburn/xfburn-blank-dialog.c
+--- xfburn-0.4.3/xfburn/xfburn-blank-dialog.c 2011-02-26 20:25:11.176013553 +0100
++++ xfburn-0.4.3-4ui/xfburn/xfburn-blank-dialog.c 2011-02-26 20:13:58.518013555 +0100
+@@ -20,7 +20,7 @@
+ #include <config.h>
+ #endif /* !HAVE_CONFIG_H */
+
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+
+ #include <libburn.h>
+
+@@ -206,7 +206,7 @@
+ g_signal_connect (G_OBJECT (priv->device_box), "volume-changed", G_CALLBACK (cb_volume_changed), obj);
+ gtk_widget_show (priv->device_box);
+
+- frame = xfce_create_framebox_with_content (_("Burning device"), priv->device_box);
++ frame = xfce_gtk_frame_box_new_with_content (_("Burning device"), priv->device_box);
+ gtk_widget_show (frame);
+ gtk_box_pack_start (box, frame, FALSE, FALSE, BORDER);
+
+@@ -219,7 +219,7 @@
+ gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (priv->combo_type), cell, "text", BLANK_COMBO_NAME_COLUMN, NULL);
+ gtk_widget_show (priv->combo_type);
+
+- frame = xfce_create_framebox_with_content (_("Blank mode"), priv->combo_type);
++ frame = xfce_gtk_frame_box_new_with_content (_("Blank mode"), priv->combo_type);
+ gtk_widget_show (frame);
+ gtk_box_pack_start (box, frame, FALSE, FALSE, BORDER);
+
+@@ -227,7 +227,7 @@
+ vbox = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox);
+
+- frame = xfce_create_framebox_with_content (_("Options"), vbox);
++ frame = xfce_gtk_frame_box_new_with_content (_("Options"), vbox);
+ gtk_widget_show (frame);
+ gtk_box_pack_start (box, frame, FALSE, FALSE, BORDER);
+
+@@ -241,7 +241,7 @@
+ gtk_widget_show (button);
+ gtk_dialog_add_action_widget (GTK_DIALOG (obj), button, GTK_RESPONSE_CANCEL);
+
+- button = xfce_create_mixed_button ("xfburn-blank-cdrw", _("_Blank"));
++ button = xfce_gtk_button_new_mixed ("xfburn-blank-cdrw", _("_Blank"));
+ gtk_widget_show (button);
+ gtk_dialog_add_action_widget (GTK_DIALOG (obj), button, GTK_RESPONSE_OK);
+ GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
+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
+--- xfburn-0.4.3/xfburn/xfburn-burn-audio-cd-composition-dialog.c 2009-10-30 02:10:13.000000000 +0100
++++ xfburn-0.4.3-4ui/xfburn/xfburn-burn-audio-cd-composition-dialog.c 2011-02-26 20:14:58.426013553 +0100
+@@ -156,7 +156,7 @@
+ g_signal_connect (G_OBJECT (priv->device_box), "volume-changed", G_CALLBACK (cb_volume_changed), obj);
+ gtk_widget_show (priv->device_box);
+
+- priv->frame_device = xfce_create_framebox_with_content (_("Burning device"), priv->device_box);
++ priv->frame_device = xfce_gtk_frame_box_new_with_content (_("Burning device"), priv->device_box);
+ gtk_widget_show (priv->frame_device);
+ gtk_box_pack_start (box, priv->frame_device, FALSE, FALSE, BORDER);
+
+@@ -168,7 +168,7 @@
+ vbox = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox);
+
+- frame = xfce_create_framebox_with_content (_("Composition name"), vbox);
++ frame = xfce_gtk_frame_box_new_with_content (_("Composition name"), vbox);
+ gtk_widget_show (frame);
+ gtk_box_pack_start (box, frame, FALSE, FALSE, BORDER);
+
+@@ -190,7 +190,7 @@
+ vbox = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox);
+
+- frame = xfce_create_framebox_with_content (_("Options"), vbox);
++ frame = xfce_gtk_frame_box_new_with_content (_("Options"), vbox);
+ gtk_widget_show (frame);
+ gtk_box_pack_start (box, frame, FALSE, FALSE, BORDER);
+
+@@ -218,7 +218,7 @@
+ gtk_widget_show (button);
+ gtk_dialog_add_action_widget (GTK_DIALOG (obj), button, GTK_RESPONSE_CANCEL);
+
+- priv->button_proceed = button = xfce_create_mixed_button ("xfburn-burn-cd", _("_Burn Composition"));
++ priv->button_proceed = button = xfce_gtk_button_new_mixed ("xfburn-burn-cd", _("_Burn Composition"));
+
+ gtk_widget_show (button);
+ gtk_dialog_add_action_widget (GTK_DIALOG (obj), button, GTK_RESPONSE_OK);
+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
+--- xfburn-0.4.3/xfburn/xfburn-burn-audio-cd-composition-dialog.h 2009-10-24 23:18:10.000000000 +0200
++++ xfburn-0.4.3-4ui/xfburn/xfburn-burn-audio-cd-composition-dialog.h 2011-02-26 16:21:06.852320585 +0100
+@@ -24,7 +24,7 @@
+ #endif /* !HAVE_CONFIG_H */
+
+ #include <gtk/gtk.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+
+ #include <libisofs.h>
+
+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
+--- xfburn-0.4.3/xfburn/xfburn-burn-data-cd-composition-dialog.h 2009-10-24 23:18:10.000000000 +0200
++++ xfburn-0.4.3-4ui/xfburn/xfburn-burn-data-cd-composition-dialog.h 2011-02-26 16:21:06.854320585 +0100
+@@ -24,7 +24,7 @@
+ #endif /* !HAVE_CONFIG_H */
+
+ #include <gtk/gtk.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+
+ #include <libisofs.h>
+ #include "xfburn-burn-data-composition-base-dialog.h"
+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
+--- xfburn-0.4.3/xfburn/xfburn-burn-data-composition-base-dialog.c 2009-10-30 02:11:13.000000000 +0100
++++ xfburn-0.4.3-4ui/xfburn/xfburn-burn-data-composition-base-dialog.c 2011-02-26 20:14:13.313013558 +0100
+@@ -192,7 +192,7 @@
+
+ g_signal_connect (G_OBJECT (priv->device_box), "volume-changed", G_CALLBACK (cb_volume_changed), obj);
+
+- priv->frame_device = xfce_create_framebox_with_content (_("Burning device"), priv->device_box);
++ priv->frame_device = xfce_gtk_frame_box_new_with_content (_("Burning device"), priv->device_box);
+ gtk_widget_show (priv->frame_device);
+ gtk_box_pack_start (box, priv->frame_device, FALSE, FALSE, BORDER);
+
+@@ -203,7 +203,7 @@
+ vbox = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox);
+
+- frame = xfce_create_framebox_with_content (_("Composition name"), vbox);
++ frame = xfce_gtk_frame_box_new_with_content (_("Composition name"), vbox);
+ gtk_widget_show (frame);
+ gtk_box_pack_start (box, frame, FALSE, FALSE, BORDER);
+
+@@ -224,7 +224,7 @@
+ vbox = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox);
+
+- frame = xfce_create_framebox_with_content (_("Options"), vbox);
++ frame = xfce_gtk_frame_box_new_with_content (_("Options"), vbox);
+ gtk_widget_show (frame);
+ gtk_box_pack_start (box, frame, FALSE, FALSE, BORDER);
+
+@@ -280,7 +280,7 @@
+ gtk_widget_show (button);
+ gtk_dialog_add_action_widget (GTK_DIALOG (obj), button, GTK_RESPONSE_CANCEL);
+
+- priv->button_proceed = button = xfce_create_mixed_button ("xfburn-burn-cd", _("_Burn Composition"));
++ priv->button_proceed = button = xfce_gtk_button_new_mixed ("xfburn-burn-cd", _("_Burn Composition"));
+ /*
+ * Disabled: change button_proceed functionality
+ button = create_proceed_button (obj, "xfburn-burn-cd", "");
+@@ -650,7 +650,7 @@
+
+ if (iso_image_create_burn_source (priv->image, write_opts, &src) < 0) {
+ /* could not create source */
+- xfce_err (_("Could not create ISO source structure."));
++ xfce_dialog_show_error (NULL, NULL, _("Could not create ISO source structure."));
+ return;
+ }
+
+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
+--- xfburn-0.4.3/xfburn/xfburn-burn-data-composition-base-dialog.h 2009-10-24 23:18:10.000000000 +0200
++++ xfburn-0.4.3-4ui/xfburn/xfburn-burn-data-composition-base-dialog.h 2011-02-26 16:21:06.856320585 +0100
+@@ -24,7 +24,7 @@
+ #endif /* !HAVE_CONFIG_H */
+
+ #include <gtk/gtk.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+
+ #include <libisofs.h>
+
+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
+--- xfburn-0.4.3/xfburn/xfburn-burn-data-dvd-composition-dialog.h 2009-10-24 23:18:10.000000000 +0200
++++ xfburn-0.4.3-4ui/xfburn/xfburn-burn-data-dvd-composition-dialog.h 2011-02-26 16:21:06.857320585 +0100
+@@ -24,7 +24,7 @@
+ #endif /* !HAVE_CONFIG_H */
+
+ #include <gtk/gtk.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+
+ #include <libisofs.h>
+ #include "xfburn-burn-data-composition-base-dialog.h"
+diff -ur xfburn-0.4.3/xfburn/xfburn-burn-image-dialog.c xfburn-0.4.3-4ui/xfburn/xfburn-burn-image-dialog.c
+--- xfburn-0.4.3/xfburn/xfburn-burn-image-dialog.c 2009-10-30 03:47:20.000000000 +0100
++++ xfburn-0.4.3-4ui/xfburn/xfburn-burn-image-dialog.c 2011-02-26 20:14:24.039013553 +0100
+@@ -173,7 +173,7 @@
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (priv->chooser_image), filter);
+ gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (priv->chooser_image), filter);
+
+- frame = xfce_create_framebox_with_content (_("Image to burn"), priv->chooser_image);
++ frame = xfce_gtk_frame_box_new_with_content (_("Image to burn"), priv->chooser_image);
+ gtk_widget_show (frame);
+ gtk_box_pack_start (box, frame, FALSE, FALSE, BORDER);
+
+@@ -188,7 +188,7 @@
+ priv->device_box = xfburn_device_box_new (SHOW_CD_WRITERS | SHOW_CDRW_WRITERS | SHOW_DVD_WRITERS | SHOW_MODE_SELECTION | SHOW_SPEED_SELECTION);
+ gtk_widget_show (priv->device_box);
+
+- frame = xfce_create_framebox_with_content (_("Burning device"), priv->device_box);
++ frame = xfce_gtk_frame_box_new_with_content (_("Burning device"), priv->device_box);
+ gtk_widget_show (frame);
+ gtk_box_pack_start (box, frame, FALSE, FALSE, BORDER);
+
+@@ -196,7 +196,7 @@
+ vbox = gtk_vbox_new (FALSE, 0);
+ gtk_widget_show (vbox);
+
+- frame = xfce_create_framebox_with_content (_("Options"), vbox);
++ frame = xfce_gtk_frame_box_new_with_content (_("Options"), vbox);
+ gtk_widget_show (frame);
+ gtk_box_pack_start (box, frame, FALSE, FALSE, BORDER);
+
+@@ -219,7 +219,7 @@
+ gtk_widget_show (button);
+ gtk_dialog_add_action_widget (GTK_DIALOG (obj), button, GTK_RESPONSE_CANCEL);
+
+- priv->burn_button = xfce_create_mixed_button ("xfburn-burn-cd", _("_Burn image"));
++ priv->burn_button = xfce_gtk_button_new_mixed ("xfburn-burn-cd", _("_Burn image"));
+ gtk_widget_show (priv->burn_button);
+ g_signal_connect (G_OBJECT (priv->burn_button), "clicked", G_CALLBACK (cb_clicked_ok), obj);
+ gtk_container_add (GTK_CONTAINER( GTK_DIALOG(obj)->action_area), priv->burn_button);
+@@ -400,7 +400,7 @@
+ void
+ burn_image_dialog_error (XfburnBurnImageDialog * dialog, const gchar * msg_error)
+ {
+- xfce_err (msg_error);
++ xfce_dialog_show_error (NULL, NULL, msg_error);
+ }
+
+ static void
+diff -ur xfburn-0.4.3/xfburn/xfburn-burn-image-dialog.h xfburn-0.4.3-4ui/xfburn/xfburn-burn-image-dialog.h
+--- xfburn-0.4.3/xfburn/xfburn-burn-image-dialog.h 2009-10-24 23:18:10.000000000 +0200
++++ xfburn-0.4.3-4ui/xfburn/xfburn-burn-image-dialog.h 2011-02-26 16:21:06.859320585 +0100
+@@ -25,7 +25,7 @@
+
+ #include <gtk/gtk.h>
+
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+
+ #include "xfburn-global.h"
+
+diff -ur xfburn-0.4.3/xfburn/xfburn-copy-cd-dialog.h xfburn-0.4.3-4ui/xfburn/xfburn-copy-cd-dialog.h
+--- xfburn-0.4.3/xfburn/xfburn-copy-cd-dialog.h 2009-10-24 23:18:10.000000000 +0200
++++ xfburn-0.4.3-4ui/xfburn/xfburn-copy-cd-dialog.h 2011-02-26 16:21:06.866320585 +0100
+@@ -25,7 +25,7 @@
+
+ #include <gtk/gtk.h>
+
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+
+ G_BEGIN_DECLS
+
+diff -ur xfburn-0.4.3/xfburn/xfburn-copy-dvd-dialog.h xfburn-0.4.3-4ui/xfburn/xfburn-copy-dvd-dialog.h
+--- xfburn-0.4.3/xfburn/xfburn-copy-dvd-dialog.h 2009-10-24 23:18:10.000000000 +0200
++++ xfburn-0.4.3-4ui/xfburn/xfburn-copy-dvd-dialog.h 2011-02-26 16:21:06.869320585 +0100
+@@ -25,7 +25,7 @@
+
+ #include <gtk/gtk.h>
+
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+
+ G_BEGIN_DECLS
+
+diff -ur xfburn-0.4.3/xfburn/xfburn-data-composition.c xfburn-0.4.3-4ui/xfburn/xfburn-data-composition.c
+--- xfburn-0.4.3/xfburn/xfburn-data-composition.c 2011-02-26 20:25:11.177013553 +0100
++++ xfburn-0.4.3-4ui/xfburn/xfburn-data-composition.c 2011-02-26 20:11:15.445153553 +0100
+@@ -35,7 +35,7 @@
+
+ #include <gtk/gtk.h>
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+
+ #include <gio/gio.h>
+
+@@ -671,7 +671,7 @@
+ GtkTreePath *real_path;
+
+ if (strlen (newtext) == 0) {
+- xfce_err (_("You must give a name to the file."));
++ xfce_dialog_show_error (NULL, NULL, _("You must give a name to the file."));
+ return;
+ }
+
+@@ -680,7 +680,7 @@
+
+ if (gtk_tree_model_get_iter (model, &iter, real_path)) {
+ if (file_exists_on_same_level (model, real_path, TRUE, newtext)) {
+- xfce_err (_("A file with the same name is already present in the composition."));
++ xfce_dialog_show_error (NULL, NULL, _("A file with the same name is already present in the composition."));
+ }
+ else {
+ gtk_tree_store_set (GTK_TREE_STORE (model), &iter, DATA_COMPOSITION_COLUMN_CONTENT, newtext, -1);
+@@ -1116,7 +1116,7 @@
+
+ gdk_threads_enter ();
+ if (file_exists_on_same_level (model, tree_path, FALSE, name)) {
+- xfce_err (_("A file with the same name is already present in the composition."));
++ xfce_dialog_show_error (NULL, NULL, _("A file with the same name is already present in the composition."));
+
+ gtk_tree_path_free (tree_path);
+ gdk_threads_leave ();
+@@ -1195,7 +1195,7 @@
+
+ if (s.st_size > MAXIMUM_ISO_FILE_SIZE) {
+ gdk_threads_enter ();
+- xfce_err (_("%s cannot be added to the composition, because it exceeds the maximum allowed file size for iso9660."), path);
++ xfce_dialog_show_error (NULL, NULL, _("%s cannot be added to the composition, because it exceeds the maximum allowed file size for iso9660."), path);
+ gdk_threads_leave ();
+
+ return FALSE;
+@@ -1448,7 +1448,7 @@
+ }
+
+ if (file_exists_on_same_level (model, path_level, FALSE, name)) {
+- xfce_warn (_("A file named \"%s\" already exists in this directory, the file hasn't been added."), name);
++ xfce_dialog_show_warning(NULL, NULL, _("A file named \"%s\" already exists in this directory, the file hasn't been added."), name);
+ goto cleanup;
+ }
+
+@@ -1861,7 +1861,7 @@
+
+ if (r == 0) {
+ /* The first string is the renamed name, the second one the original name */
+- xfce_warn (_("Duplicate filename '%s' for '%s'"), name, src);
++ xfce_dialog_show_warning(NULL, NULL, _("Duplicate filename '%s' for '%s'"), name, src);
+
+ g_free (basename);
+ g_free (name);
+diff -ur xfburn-0.4.3/xfburn/xfburn-data-disc-usage.c xfburn-0.4.3-4ui/xfburn/xfburn-data-disc-usage.c
+--- xfburn-0.4.3/xfburn/xfburn-data-disc-usage.c 2009-10-24 23:18:10.000000000 +0200
++++ xfburn-0.4.3-4ui/xfburn/xfburn-data-disc-usage.c 2011-02-26 16:21:03.628320584 +0100
+@@ -22,7 +22,6 @@
+
+ #include <gtk/gtk.h>
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/libxfcegui4.h>
+
+ #include "xfburn-disc-usage.h"
+ #include "xfburn-data-disc-usage.h"
+diff -ur xfburn-0.4.3/xfburn/xfburn-device-box.c xfburn-0.4.3-4ui/xfburn/xfburn-device-box.c
+--- xfburn-0.4.3/xfburn/xfburn-device-box.c 2011-02-26 20:25:11.178013553 +0100
++++ xfburn-0.4.3-4ui/xfburn/xfburn-device-box.c 2011-02-26 16:21:03.642320584 +0100
+@@ -23,7 +23,6 @@
+
+ #include <gtk/gtk.h>
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/libxfcegui4.h>
+
+ #include "xfburn-device-list.h"
+ #include "xfburn-device-box.h"
+diff -ur xfburn-0.4.3/xfburn/xfburn-directory-browser.c xfburn-0.4.3-4ui/xfburn/xfburn-directory-browser.c
+--- xfburn-0.4.3/xfburn/xfburn-directory-browser.c 2011-02-26 20:25:11.182013553 +0100
++++ xfburn-0.4.3-4ui/xfburn/xfburn-directory-browser.c 2011-02-26 16:21:03.667320584 +0100
+@@ -26,7 +26,6 @@
+
+ #include <gtk/gtk.h>
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/libxfcegui4.h>
+
+ #include <gio/gio.h>
+
+diff -ur xfburn-0.4.3/xfburn/xfburn-disc-usage.c xfburn-0.4.3-4ui/xfburn/xfburn-disc-usage.c
+--- xfburn-0.4.3/xfburn/xfburn-disc-usage.c 2009-10-24 23:18:10.000000000 +0200
++++ xfburn-0.4.3-4ui/xfburn/xfburn-disc-usage.c 2011-02-26 20:14:37.314013551 +0100
+@@ -30,7 +30,7 @@
+
+ #include <gtk/gtk.h>
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+
+ #include "xfburn-disc-usage.h"
+ #include "xfburn-global.h"
+@@ -160,7 +160,7 @@
+ gtk_box_pack_start (GTK_BOX (disc_usage), disc_usage->combo, FALSE, FALSE, BORDER);
+ gtk_widget_show (disc_usage->combo);
+
+- disc_usage->button = xfce_create_mixed_button (XFBURN_STOCK_BURN_CD, _("Proceed to Burn"));
++ disc_usage->button = xfce_gtk_button_new_mixed (XFBURN_STOCK_BURN_CD, _("Proceed to Burn"));
+ gtk_box_pack_start (GTK_BOX (disc_usage), disc_usage->button, FALSE, FALSE, BORDER);
+ gtk_widget_set_sensitive (disc_usage->button, FALSE);
+ gtk_widget_show (disc_usage->button);
+@@ -200,7 +200,7 @@
+ if (du->size <= class->labels[gtk_combo_box_get_active (GTK_COMBO_BOX (du->combo))].size) {
+ g_signal_emit (G_OBJECT (du), signals[BEGIN_BURN], 0);
+ } else {
+- xfce_err (_("You are trying to burn more onto the disc than it can hold."));
++ xfce_dialog_show_error (NULL, NULL, _("You are trying to burn more onto the disc than it can hold."));
+ }
+ }
+
+diff -ur xfburn-0.4.3/xfburn/xfburn-file-browser.c xfburn-0.4.3-4ui/xfburn/xfburn-file-browser.c
+--- xfburn-0.4.3/xfburn/xfburn-file-browser.c 2009-10-24 23:18:10.000000000 +0200
++++ xfburn-0.4.3-4ui/xfburn/xfburn-file-browser.c 2011-02-26 16:21:03.678320584 +0100
+@@ -26,7 +26,6 @@
+
+ #include <gtk/gtk.h>
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/libxfcegui4.h>
+
+ #include "xfburn-file-browser.h"
+ #include "xfburn-fs-browser.h"
+diff -ur xfburn-0.4.3/xfburn/xfburn-fs-browser.c xfburn-0.4.3-4ui/xfburn/xfburn-fs-browser.c
+--- xfburn-0.4.3/xfburn/xfburn-fs-browser.c 2009-10-24 23:18:10.000000000 +0200
++++ xfburn-0.4.3-4ui/xfburn/xfburn-fs-browser.c 2011-02-26 16:21:03.684320584 +0100
+@@ -24,7 +24,6 @@
+ #include <string.h>
+ #endif
+
+-#include <libxfcegui4/libxfcegui4.h>
+ #include <libxfce4util/libxfce4util.h>
+
+ #include "xfburn-fs-browser.h"
+diff -ur xfburn-0.4.3/xfburn/xfburn-main.c xfburn-0.4.3-4ui/xfburn/xfburn-main.c
+--- xfburn-0.4.3/xfburn/xfburn-main.c 2011-02-26 20:25:11.186013553 +0100
++++ xfburn-0.4.3-4ui/xfburn/xfburn-main.c 2011-02-26 20:10:39.291239575 +0100
+@@ -29,7 +29,7 @@
+ #include <gtk/gtk.h>
+
+ #include <libxfce4util/libxfce4util.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+
+ #ifdef HAVE_GST
+ #include <gst/gst.h>
+@@ -217,7 +217,7 @@
+
+ if (!burn_initialize ()) {
+ g_critical ("Unable to initialize libburn");
+- xfce_err (_("Unable to initialize the burning backend."));
++ xfce_dialog_show_error (NULL, NULL, _("Unable to initialize the burning backend."));
+ gdk_threads_leave ();
+ return EXIT_FAILURE;
+ }
+@@ -274,7 +274,7 @@
+ #ifdef HAVE_GUDEV
+ error_msg = xfburn_udev_manager_create_global ();
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfburn/xfburn.spec?r1=1.19&r2=1.20&f=u
More information about the pld-cvs-commit
mailing list