[Goodies-commits] r5403 - in xfburn/trunk: . xfburn
David Mohr
squisher at xfce.org
Sun Sep 14 10:32:03 CEST 2008
Author: squisher
Date: 2008-09-14 08:32:03 +0000 (Sun, 14 Sep 2008)
New Revision: 5403
Modified:
xfburn/trunk/configure.in.in
xfburn/trunk/xfburn/Makefile.am
xfburn/trunk/xfburn/xfburn-adding-progress.c
xfburn/trunk/xfburn/xfburn-audio-composition.c
xfburn/trunk/xfburn/xfburn-audio-disc-usage.c
xfburn/trunk/xfburn/xfburn-blank-dialog.c
xfburn/trunk/xfburn/xfburn-burn-audio-cd-composition-dialog.c
xfburn/trunk/xfburn/xfburn-burn-data-cd-composition-dialog.c
xfburn/trunk/xfburn/xfburn-burn-data-composition-base-dialog.c
xfburn/trunk/xfburn/xfburn-burn-data-dvd-composition-dialog.c
xfburn/trunk/xfburn/xfburn-burn-image-dialog.c
xfburn/trunk/xfburn/xfburn-composition.c
xfburn/trunk/xfburn/xfburn-compositions-notebook.c
xfburn/trunk/xfburn/xfburn-copy-cd-dialog.c
xfburn/trunk/xfburn/xfburn-copy-cd-progress-dialog.c
xfburn/trunk/xfburn/xfburn-copy-dvd-dialog.c
xfburn/trunk/xfburn/xfburn-create-iso-progress-dialog.c
xfburn/trunk/xfburn/xfburn-data-composition.c
xfburn/trunk/xfburn/xfburn-data-disc-usage.c
xfburn/trunk/xfburn/xfburn-device-box.c
xfburn/trunk/xfburn/xfburn-device-list.c
xfburn/trunk/xfburn/xfburn-directory-browser.c
xfburn/trunk/xfburn/xfburn-disc-usage.c
xfburn/trunk/xfburn/xfburn-file-browser.c
xfburn/trunk/xfburn/xfburn-format-dvd-dialog.c
xfburn/trunk/xfburn/xfburn-fs-browser.c
xfburn/trunk/xfburn/xfburn-hal-manager.c
xfburn/trunk/xfburn/xfburn-main-window.c
xfburn/trunk/xfburn/xfburn-main.c
xfburn/trunk/xfburn/xfburn-notebook-tab.c
xfburn/trunk/xfburn/xfburn-preferences-dialog.c
xfburn/trunk/xfburn/xfburn-progress-dialog.c
xfburn/trunk/xfburn/xfburn-settings.c
xfburn/trunk/xfburn/xfburn-welcome-tab.c
Log:
* Add gstreamer flags to configure,
* initialize gstreamer,
* have gcc report more warnings, and fix 'em
Modified: xfburn/trunk/configure.in.in
===================================================================
--- xfburn/trunk/configure.in.in 2008-09-13 23:44:05 UTC (rev 5402)
+++ xfburn/trunk/configure.in.in 2008-09-14 08:32:03 UTC (rev 5403)
@@ -75,9 +75,20 @@
fi
AC_SUBST([HAL_STORAGE_DEPENDENCY])
+dnl **************************************
+dnl *** Optional support for gstreamer ***
+dnl **************************************
+dnl (based on xfce4-mixer (trunk at 27735)
+dnl XDT_CHECK_OPTIONAL_PACKAGE([GST_PLUGINS_BASE], [gstreamer-plugins-base-0.10], [0.10.2])
+XDT_CHECK_OPTIONAL_PACKAGE([GSTREAMER], [gstreamer-0.10], [0.10.2])
+
dnl check for debugging support
BM_DEBUG_SUPPORT()
+dnl add -Wextra if debug is enabled
+if test x"$enable_debug" != x"no"; then
+ CFLAGS="$CFLAGS -Wextra -Wno-unused-parameter -Wno-sign-compare"
+fi
AC_OUTPUT([
Makefile
Modified: xfburn/trunk/xfburn/Makefile.am
===================================================================
--- xfburn/trunk/xfburn/Makefile.am 2008-09-13 23:44:05 UTC (rev 5402)
+++ xfburn/trunk/xfburn/Makefile.am 2008-09-14 08:32:03 UTC (rev 5403)
@@ -81,7 +81,8 @@
$(LIBISOFS_CFLAGS) \
$(LIBXFCEGUI4_CFLAGS) \
$(EXO_CFLAGS) \
- $(THUNAR_VFS_CFLAGS)
+ $(THUNAR_VFS_CFLAGS) \
+ $(GSTREAMER_CFLAGS)
xfburn_LDADD = \
$(GTHREAD_LIBS) \
@@ -89,7 +90,8 @@
$(LIBISOFS_LIBS) \
$(LIBXFCEGUI4_LIBS) \
$(EXO_LIBS) \
- $(THUNAR_VFS_LIBS)
+ $(THUNAR_VFS_LIBS) \
+ $(GSTREAMER_LIBS)
if HAVE_HAL
xfburn_CFLAGS += \
Modified: xfburn/trunk/xfburn/xfburn-adding-progress.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-adding-progress.c 2008-09-13 23:44:05 UTC (rev 5402)
+++ xfburn/trunk/xfburn/xfburn-adding-progress.c 2008-09-14 08:32:03 UTC (rev 5403)
@@ -72,7 +72,8 @@
NULL,
sizeof (XfburnAddingProgress),
0,
- (GInstanceInitFunc) xfburn_adding_progress_init
+ (GInstanceInitFunc) xfburn_adding_progress_init,
+ NULL
};
adding_progress_type = g_type_register_static (GTK_TYPE_WINDOW, "XfburnAddingProgress", &adding_progress_info, 0);
Modified: xfburn/trunk/xfburn/xfburn-audio-composition.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-audio-composition.c 2008-09-13 23:44:05 UTC (rev 5402)
+++ xfburn/trunk/xfburn/xfburn-audio-composition.c 2008-09-14 08:32:03 UTC (rev 5403)
@@ -213,7 +213,7 @@
G_CALLBACK (action_remove_selection),},
{"clear", GTK_STOCK_CLEAR, N_("Clear"), NULL, N_("Clear the content of the composition"),
G_CALLBACK (action_clear),},
- {"import-session", "xfburn-import-session", N_("Import"), NULL, N_("Import existing session"),},
+ //{"import-session", "xfburn-import-session", N_("Import"), NULL, N_("Import existing session"),},
{"rename-artist", GTK_STOCK_EDIT, N_("Rename Artist"), NULL, N_("Rename the artist of the selected file"),
G_CALLBACK (action_rename_selection_artist),},
{"rename-title", GTK_STOCK_EDIT, N_("Rename Title"), NULL, N_("Rename the title of the selected file"),
@@ -247,7 +247,8 @@
NULL,
sizeof (XfburnAudioComposition),
0,
- (GInstanceInitFunc) xfburn_audio_composition_init
+ (GInstanceInitFunc) xfburn_audio_composition_init,
+ NULL
};
static const GInterfaceInfo composition_info = {
@@ -2082,7 +2083,7 @@
XfburnAudioCompositionPrivate *priv = XFBURN_AUDIO_COMPOSITION_GET_PRIVATE (composition);
FILE *file_content;
GtkTreeModel *model;
- CompositionSaveInfo info = {};
+ CompositionSaveInfo info;
gint i;
if (!(priv->filename)) {
Modified: xfburn/trunk/xfburn/xfburn-audio-disc-usage.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-audio-disc-usage.c 2008-09-13 23:44:05 UTC (rev 5402)
+++ xfburn/trunk/xfburn/xfburn-audio-disc-usage.c 2008-09-14 08:32:03 UTC (rev 5403)
@@ -78,7 +78,8 @@
NULL,
sizeof (XfburnAudioDiscUsage),
0,
- (GInstanceInitFunc) xfburn_audio_disc_usage_init
+ (GInstanceInitFunc) xfburn_audio_disc_usage_init,
+ NULL
};
disc_usage_type = g_type_register_static (XFBURN_TYPE_DISC_USAGE, "XfburnAudioDiscUsage", &disc_usage_info, 0);
Modified: xfburn/trunk/xfburn/xfburn-blank-dialog.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-blank-dialog.c 2008-09-13 23:44:05 UTC (rev 5402)
+++ xfburn/trunk/xfburn/xfburn-blank-dialog.c 2008-09-14 08:32:03 UTC (rev 5403)
@@ -125,6 +125,7 @@
sizeof (XfburnBlankDialog),
0,
(GInstanceInitFunc) xfburn_blank_dialog_init,
+ NULL,
};
type = g_type_register_static (XFCE_TYPE_TITLED_DIALOG, "XfburnBlankDialog", &our_info, 0);
Modified: xfburn/trunk/xfburn/xfburn-burn-audio-cd-composition-dialog.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-burn-audio-cd-composition-dialog.c 2008-09-13 23:44:05 UTC (rev 5402)
+++ xfburn/trunk/xfburn/xfburn-burn-audio-cd-composition-dialog.c 2008-09-14 08:32:03 UTC (rev 5403)
@@ -104,6 +104,7 @@
sizeof (XfburnBurnAudioCdCompositionDialog),
0,
NULL,
+ NULL
};
type = g_type_register_static (XFCE_TYPE_TITLED_DIALOG, "XfburnBurnAudioCdCompositionDialog", &our_info, 0);
Modified: xfburn/trunk/xfburn/xfburn-burn-data-cd-composition-dialog.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-burn-data-cd-composition-dialog.c 2008-09-13 23:44:05 UTC (rev 5402)
+++ xfburn/trunk/xfburn/xfburn-burn-data-cd-composition-dialog.c 2008-09-14 08:32:03 UTC (rev 5403)
@@ -71,6 +71,7 @@
sizeof (XfburnBurnDataCdCompositionDialog),
0,
(GInstanceInitFunc) xfburn_burn_data_cd_composition_dialog_init,
+ NULL
};
type = g_type_register_static (XFBURN_TYPE_BURN_DATA_COMPOSITION_BASE_DIALOG, "XfburnBurnDataCdCompositionDialog", &our_info, 0);
Modified: xfburn/trunk/xfburn/xfburn-burn-data-composition-base-dialog.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-burn-data-composition-base-dialog.c 2008-09-13 23:44:05 UTC (rev 5402)
+++ xfburn/trunk/xfburn/xfburn-burn-data-composition-base-dialog.c 2008-09-14 08:32:03 UTC (rev 5403)
@@ -126,6 +126,7 @@
sizeof (XfburnBurnDataCompositionBaseDialog),
0,
NULL,
+ NULL
};
type = g_type_register_static (XFCE_TYPE_TITLED_DIALOG, "XfburnBurnDataCompositionBaseDialog", &our_info, 0);
Modified: xfburn/trunk/xfburn/xfburn-burn-data-dvd-composition-dialog.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-burn-data-dvd-composition-dialog.c 2008-09-13 23:44:05 UTC (rev 5402)
+++ xfburn/trunk/xfburn/xfburn-burn-data-dvd-composition-dialog.c 2008-09-14 08:32:03 UTC (rev 5403)
@@ -72,6 +72,7 @@
sizeof (XfburnBurnDataDvdCompositionDialog),
0,
(GInstanceInitFunc) xfburn_burn_data_dvd_composition_dialog_init,
+ NULL
};
type = g_type_register_static (XFBURN_TYPE_BURN_DATA_COMPOSITION_BASE_DIALOG, "XfburnBurnDataDvdCompositionDialog", &our_info, 0);
Modified: xfburn/trunk/xfburn/xfburn-burn-image-dialog.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-burn-image-dialog.c 2008-09-13 23:44:05 UTC (rev 5402)
+++ xfburn/trunk/xfburn/xfburn-burn-image-dialog.c 2008-09-14 08:32:03 UTC (rev 5403)
@@ -104,6 +104,7 @@
sizeof (XfburnBurnImageDialog),
0,
(GInstanceInitFunc) xfburn_burn_image_dialog_init,
+ NULL
};
type = g_type_register_static (XFCE_TYPE_TITLED_DIALOG, "XfburnBurnImageDialog", &our_info, 0);
Modified: xfburn/trunk/xfburn/xfburn-composition.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-composition.c 2008-09-13 23:44:05 UTC (rev 5402)
+++ xfburn/trunk/xfburn/xfburn-composition.c 2008-09-14 08:32:03 UTC (rev 5403)
@@ -63,7 +63,8 @@
NULL, /* class_data */
0,
0, /* n_preallocs */
- NULL /* instance_init */
+ NULL, /* instance_init */
+ NULL
};
type = g_type_register_static (G_TYPE_INTERFACE, "XfburnComposition", &info, 0);
Modified: xfburn/trunk/xfburn/xfburn-compositions-notebook.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-compositions-notebook.c 2008-09-13 23:44:05 UTC (rev 5402)
+++ xfburn/trunk/xfburn/xfburn-compositions-notebook.c 2008-09-14 08:32:03 UTC (rev 5403)
@@ -74,6 +74,7 @@
sizeof (XfburnCompositionsNotebook),
0,
(GInstanceInitFunc) xfburn_compositions_notebook_init,
+ NULL
};
type = g_type_register_static (GTK_TYPE_NOTEBOOK, "XfburnCompositionsNotebook", &our_info, 0);
Modified: xfburn/trunk/xfburn/xfburn-copy-cd-dialog.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-copy-cd-dialog.c 2008-09-13 23:44:05 UTC (rev 5402)
+++ xfburn/trunk/xfburn/xfburn-copy-cd-dialog.c 2008-09-14 08:32:03 UTC (rev 5403)
@@ -81,6 +81,7 @@
sizeof (XfburnCopyCdDialog),
0,
(GInstanceInitFunc) xfburn_copy_cd_dialog_init,
+ NULL
};
type = g_type_register_static (XFCE_TYPE_TITLED_DIALOG, "XfburnCopyCdDialog", &our_info, 0);
Modified: xfburn/trunk/xfburn/xfburn-copy-cd-progress-dialog.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-copy-cd-progress-dialog.c 2008-09-13 23:44:05 UTC (rev 5402)
+++ xfburn/trunk/xfburn/xfburn-copy-cd-progress-dialog.c 2008-09-14 08:32:03 UTC (rev 5403)
@@ -58,6 +58,7 @@
sizeof (XfburnCopyCdProgressDialog),
0,
(GInstanceInitFunc) xfburn_copy_cd_progress_dialog_init,
+ NULL
};
type = g_type_register_static (XFBURN_TYPE_PROGRESS_DIALOG, "XfburnCopyCdProgressDialog", &our_info, 0);
Modified: xfburn/trunk/xfburn/xfburn-copy-dvd-dialog.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-copy-dvd-dialog.c 2008-09-13 23:44:05 UTC (rev 5402)
+++ xfburn/trunk/xfburn/xfburn-copy-dvd-dialog.c 2008-09-14 08:32:03 UTC (rev 5403)
@@ -81,6 +81,7 @@
sizeof (XfburnCopyDvdDialog),
0,
(GInstanceInitFunc) xfburn_copy_dvd_dialog_init,
+ NULL
};
type = g_type_register_static (XFCE_TYPE_TITLED_DIALOG, "XfburnCopyDvdDialog", &our_info, 0);
Modified: xfburn/trunk/xfburn/xfburn-create-iso-progress-dialog.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-create-iso-progress-dialog.c 2008-09-13 23:44:05 UTC (rev 5402)
+++ xfburn/trunk/xfburn/xfburn-create-iso-progress-dialog.c 2008-09-14 08:32:03 UTC (rev 5403)
@@ -58,6 +58,7 @@
sizeof (XfburnCreateIsoProgressDialog),
0,
(GInstanceInitFunc) xfburn_create_iso_progress_dialog_init,
+ NULL
};
type = g_type_register_static (XFBURN_TYPE_PROGRESS_DIALOG, "XfburnCreateIsoProgressDialog", &our_info, 0);
Modified: xfburn/trunk/xfburn/xfburn-data-composition.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-data-composition.c 2008-09-13 23:44:05 UTC (rev 5402)
+++ xfburn/trunk/xfburn/xfburn-data-composition.c 2008-09-14 08:32:03 UTC (rev 5403)
@@ -184,7 +184,7 @@
G_CALLBACK (action_remove_selection),},
{"clear", GTK_STOCK_CLEAR, N_("Clear"), NULL, N_("Clear the content of the composition"),
G_CALLBACK (action_clear),},
- {"import-session", "xfburn-import-session", N_("Import"), NULL, N_("Import existing session"),},
+ /*{"import-session", "xfburn-import-session", N_("Import"), NULL, N_("Import existing session"),}, */
{"rename-file", GTK_STOCK_EDIT, N_("Rename"), NULL, N_("Rename the selected file"),
G_CALLBACK (action_rename_selection),},
};
@@ -217,7 +217,8 @@
NULL,
sizeof (XfburnDataComposition),
0,
- (GInstanceInitFunc) xfburn_data_composition_init
+ (GInstanceInitFunc) xfburn_data_composition_init,
+ NULL
};
static const GInterfaceInfo composition_info = {
@@ -2017,7 +2018,7 @@
XfburnDataCompositionPrivate *priv = XFBURN_DATA_COMPOSITION_GET_PRIVATE (composition);
FILE *file_content;
GtkTreeModel *model;
- CompositionSaveInfo info = {};
+ CompositionSaveInfo info;
gint i;
if (!(priv->filename)) {
Modified: xfburn/trunk/xfburn/xfburn-data-disc-usage.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-data-disc-usage.c 2008-09-13 23:44:05 UTC (rev 5402)
+++ xfburn/trunk/xfburn/xfburn-data-disc-usage.c 2008-09-14 08:32:03 UTC (rev 5403)
@@ -82,7 +82,8 @@
NULL,
sizeof (XfburnDataDiscUsage),
0,
- (GInstanceInitFunc) xfburn_data_disc_usage_init
+ (GInstanceInitFunc) xfburn_data_disc_usage_init,
+ NULL
};
disc_usage_type = g_type_register_static (XFBURN_TYPE_DISC_USAGE, "XfburnDataDiscUsage", &disc_usage_info, 0);
Modified: xfburn/trunk/xfburn/xfburn-device-box.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-device-box.c 2008-09-13 23:44:05 UTC (rev 5402)
+++ xfburn/trunk/xfburn/xfburn-device-box.c 2008-09-14 08:32:03 UTC (rev 5403)
@@ -144,7 +144,8 @@
NULL,
sizeof (XfburnDeviceBox),
0,
- (GInstanceInitFunc) xfburn_device_box_init
+ (GInstanceInitFunc) xfburn_device_box_init,
+ NULL
};
device_box_type = g_type_register_static (GTK_TYPE_VBOX, "XfburnDeviceBox", &device_box_info, 0);
Modified: xfburn/trunk/xfburn/xfburn-device-list.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-device-list.c 2008-09-13 23:44:05 UTC (rev 5402)
+++ xfburn/trunk/xfburn/xfburn-device-list.c 2008-09-14 08:32:03 UTC (rev 5403)
@@ -162,7 +162,8 @@
get_libburn_device_list ()
{
struct burn_drive_info *drives;
- gint i, ret;
+ guint i;
+ gint ret;
gboolean can_burn;
guint n_drives = 0;
guint n_burners = 0;
Modified: xfburn/trunk/xfburn/xfburn-directory-browser.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-directory-browser.c 2008-09-13 23:44:05 UTC (rev 5402)
+++ xfburn/trunk/xfburn/xfburn-directory-browser.c 2008-09-14 08:32:03 UTC (rev 5403)
@@ -76,7 +76,8 @@
NULL,
sizeof (XfburnDirectoryBrowser),
0,
- (GInstanceInitFunc) xfburn_directory_browser_init
+ (GInstanceInitFunc) xfburn_directory_browser_init,
+ NULL
};
directory_browser_type =
Modified: xfburn/trunk/xfburn/xfburn-disc-usage.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-disc-usage.c 2008-09-13 23:44:05 UTC (rev 5402)
+++ xfburn/trunk/xfburn/xfburn-disc-usage.c 2008-09-14 08:32:03 UTC (rev 5403)
@@ -94,7 +94,8 @@
NULL,
sizeof (XfburnDiscUsage),
0,
- (GInstanceInitFunc) xfburn_disc_usage_init
+ (GInstanceInitFunc) xfburn_disc_usage_init,
+ NULL
};
disc_usage_type = g_type_register_static (GTK_TYPE_HBOX, "XfburnDiscUsage", &disc_usage_info, 0);
Modified: xfburn/trunk/xfburn/xfburn-file-browser.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-file-browser.c 2008-09-13 23:44:05 UTC (rev 5402)
+++ xfburn/trunk/xfburn/xfburn-file-browser.c 2008-09-14 08:32:03 UTC (rev 5403)
@@ -73,7 +73,8 @@
NULL,
sizeof (XfburnFileBrowser),
0,
- (GInstanceInitFunc) xfburn_file_browser_init
+ (GInstanceInitFunc) xfburn_file_browser_init,
+ NULL
};
file_browser_type = g_type_register_static (GTK_TYPE_HPANED, "XfburnFileBrowser", &file_browser_info, 0);
Modified: xfburn/trunk/xfburn/xfburn-format-dvd-dialog.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-format-dvd-dialog.c 2008-09-13 23:44:05 UTC (rev 5402)
+++ xfburn/trunk/xfburn/xfburn-format-dvd-dialog.c 2008-09-14 08:32:03 UTC (rev 5403)
@@ -64,6 +64,7 @@
sizeof (XfburnFormatDvdDialog),
0,
(GInstanceInitFunc) xfburn_format_dvd_dialog_init,
+ NULL
};
type = g_type_register_static (XFCE_TYPE_TITLED_DIALOG, "XfburnFormatDvdDialog", &our_info, 0);
Modified: xfburn/trunk/xfburn/xfburn-fs-browser.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-fs-browser.c 2008-09-13 23:44:05 UTC (rev 5402)
+++ xfburn/trunk/xfburn/xfburn-fs-browser.c 2008-09-14 08:32:03 UTC (rev 5403)
@@ -61,6 +61,7 @@
sizeof (XfburnFsBrowser),
0,
(GInstanceInitFunc) xfburn_fs_browser_init,
+ NULL
};
type = g_type_register_static (EXO_TYPE_TREE_VIEW, "XfburnFsBrowser", &our_info, 0);
Modified: xfburn/trunk/xfburn/xfburn-hal-manager.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-hal-manager.c 2008-09-13 23:44:05 UTC (rev 5402)
+++ xfburn/trunk/xfburn/xfburn-hal-manager.c 2008-09-14 08:32:03 UTC (rev 5403)
@@ -95,6 +95,7 @@
sizeof (XfburnHalManager),
0,
(GInstanceInitFunc) xfburn_hal_manager_init,
+ NULL
};
type = g_type_register_static (G_TYPE_OBJECT, "XfburnHalManager", &our_info, 0);
Modified: xfburn/trunk/xfburn/xfburn-main-window.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-main-window.c 2008-09-13 23:44:05 UTC (rev 5402)
+++ xfburn/trunk/xfburn/xfburn-main-window.c 2008-09-14 08:32:03 UTC (rev 5403)
@@ -98,7 +98,7 @@
/* globals */
static GtkWindowClass *parent_class = NULL;
static const GtkActionEntry action_entries[] = {
- {"file-menu", NULL, N_("_File"), NULL,},
+ {"file-menu", NULL, N_("_File"), NULL, NULL, NULL},
/*{"new-composition", GTK_STOCK_NEW, N_("_New composition"), "", N_("Create a new composition"),},*/
/*{"new-composition", GTK_STOCK_NEW, N_("_New composition"), NULL, N_("Create a new composition"),
G_CALLBACK (action_new_data_composition),}, */
@@ -115,21 +115,21 @@
{"close-composition", GTK_STOCK_CLOSE, N_("Close composition"), NULL, N_("Close composition"),
G_CALLBACK (action_close),},
{"quit", GTK_STOCK_QUIT, N_("_Quit"), NULL, N_("Quit Xfburn"), G_CALLBACK (action_quit),},
- {"edit-menu", NULL, N_("_Edit"), NULL,},
+ {"edit-menu", NULL, N_("_Edit"), NULL, NULL, NULL},
{"preferences", GTK_STOCK_PREFERENCES, N_("Prefere_nces"), NULL, N_("Show preferences dialog"),
G_CALLBACK (action_preferences),},
- {"action-menu", NULL, N_("_Actions"), NULL,},
- {"view-menu", NULL, N_("_View"), NULL,},
+ {"action-menu", NULL, N_("_Actions"), NULL, NULL, NULL},
+ {"view-menu", NULL, N_("_View"), NULL, NULL, NULL},
{"refresh", GTK_STOCK_REFRESH, N_("Refresh"), NULL, N_("Refresh file list"),
G_CALLBACK (action_refresh_directorybrowser),},
- {"help-menu", NULL, N_("_Help"), NULL,},
+ {"help-menu", NULL, N_("_Help"), NULL, NULL, NULL},
{"about", GTK_STOCK_ABOUT, N_("_About"), NULL, N_("Display information about Xfburn"),
G_CALLBACK (action_about),},
{"blank-disc", "xfburn-blank-cdrw", N_("Blank CD-RW"), NULL, N_("Blank CD-RW"),
G_CALLBACK (action_blank),},
{"copy-data", "xfburn-data-copy", N_("Copy Data CD"), NULL, N_("Copy Data CD"),
G_CALLBACK (action_copy_cd),},
- {"copy-audio", "xfburn-audio-copy", N_("Copy Audio CD"), NULL, N_("Copy Audio CD"),},
+ /*{"copy-audio", "xfburn-audio-copy", N_("Copy Audio CD"), NULL, N_("Copy Audio CD"),}, */
{"burn-image", "xfburn-burn-cd", N_("Burn Image"), NULL, N_("Burn Image"),
G_CALLBACK (action_burn_image),},
/* {"format-dvd", "xfburn-format-dvdrw", N_("Format DVD+RW"), NULL, N_("Format DVD+RW"),
@@ -185,7 +185,8 @@
NULL,
sizeof (XfburnMainWindow),
0,
- (GInstanceInitFunc) xfburn_main_window_init
+ (GInstanceInitFunc) xfburn_main_window_init,
+ NULL
};
main_window_type = g_type_register_static (GTK_TYPE_WINDOW, "XfburnMainWindow", &main_window_info, 0);
Modified: xfburn/trunk/xfburn/xfburn-main.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-main.c 2008-09-13 23:44:05 UTC (rev 5402)
+++ xfburn/trunk/xfburn/xfburn-main.c 2008-09-14 08:32:03 UTC (rev 5403)
@@ -36,6 +36,10 @@
#include <thunar-vfs/thunar-vfs.h>
#endif
+#ifdef HAVE_GSTREAMER
+#include <gst/gst.h>
+#endif
+
#include "xfburn-global.h"
#include "xfburn-device-list.h"
#include "xfburn-utils.h"
@@ -73,7 +77,7 @@
"Display program version and exit", NULL },
{ "main", 'm', G_OPTION_FLAG_NO_ARG , G_OPTION_ARG_NONE, &show_main,
"Show main program even when other action is specified on the command line.", NULL },
- { NULL },
+ { NULL, ' ', 0, 0, NULL, NULL, NULL }
};
static gboolean parse_option (const gchar *option_name, const gchar *value,
@@ -160,15 +164,43 @@
if (error != NULL) {
g_print (_("%s: %s\nTry %s --help to see a full list of available command line options.\n"), PACKAGE, error->message, PACKAGE_NAME);
g_error_free (error);
- return 1;
+ return EXIT_FAILURE;
}
}
+#ifdef HAVE_GSTREAMER
+ if (!gst_init_check (&argc, &argv, &error)) {
+ g_warning ("Failed to initialize gstreamer!");
+ /* later make this a soft failure, and just disable gstreamer functionality */
+ return EXIT_FAILURE;
+ }
+#endif
+
if (show_version) {
- g_print ("\tThis is %s version %s for Xfce %s\n", PACKAGE, VERSION, xfce_version_string ());
+#ifdef HAVE_GSTREAMER
+ const char *nano_str;
+ guint gst_major, gst_minor, gst_micro, gst_nano;
+#endif
+
+ g_print ("%s version %s for Xfce %s\n", PACKAGE, VERSION, xfce_version_string ());
g_print ("\tbuilt with GTK+-%d.%d.%d, ", GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
g_print ("linked with GTK+-%d.%d.%d.\n", gtk_major_version, gtk_minor_version, gtk_micro_version);
+#ifdef HAVE_GSTREAMER
+ gst_version (&gst_major, &gst_minor, &gst_micro, &gst_nano);
+
+ if (gst_nano == 1)
+ nano_str = " (CVS)";
+ else if (gst_nano == 2)
+ nano_str = " (Prerelease)";
+ else
+ nano_str = "";
+
+ g_print ("\tGStreamer support (built with %d.%d.%d, linked against %d.%d.%d%s)\n",
+ GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO,
+ gst_major, gst_minor, gst_micro, nano_str);
+
+#endif
exit (EXIT_SUCCESS);
}
Modified: xfburn/trunk/xfburn/xfburn-notebook-tab.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-notebook-tab.c 2008-09-13 23:44:05 UTC (rev 5402)
+++ xfburn/trunk/xfburn/xfburn-notebook-tab.c 2008-09-14 08:32:03 UTC (rev 5403)
@@ -79,6 +79,7 @@
sizeof (XfburnNotebookTab),
0,
(GInstanceInitFunc) xfburn_notebook_tab_init,
+ NULL
};
type = g_type_register_static (GTK_TYPE_HBOX, "XfburnNotebookTab", &our_info, 0);
Modified: xfburn/trunk/xfburn/xfburn-preferences-dialog.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-preferences-dialog.c 2008-09-13 23:44:05 UTC (rev 5402)
+++ xfburn/trunk/xfburn/xfburn-preferences-dialog.c 2008-09-14 08:32:03 UTC (rev 5403)
@@ -100,6 +100,7 @@
sizeof (XfburnPreferencesDialog),
0,
(GInstanceInitFunc) xfburn_preferences_dialog_init,
+ NULL
};
type = g_type_register_static (XFCE_TYPE_TITLED_DIALOG, "XfburnPreferencesDialog", &our_info, 0);
Modified: xfburn/trunk/xfburn/xfburn-progress-dialog.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-progress-dialog.c 2008-09-13 23:44:05 UTC (rev 5402)
+++ xfburn/trunk/xfburn/xfburn-progress-dialog.c 2008-09-14 08:32:03 UTC (rev 5403)
@@ -123,6 +123,7 @@
sizeof (XfburnProgressDialog),
0,
(GInstanceInitFunc) xfburn_progress_dialog_init,
+ NULL
};
type = g_type_register_static (GTK_TYPE_DIALOG, "XfburnProgressDialog", &our_info, 0);
Modified: xfburn/trunk/xfburn/xfburn-settings.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-settings.c 2008-09-13 23:44:05 UTC (rev 5402)
+++ xfburn/trunk/xfburn/xfburn-settings.c 2008-09-14 08:32:03 UTC (rev 5403)
@@ -99,6 +99,7 @@
sizeof (XfburnSettings),
0,
(GInstanceInitFunc) xfburn_settings_internal_init,
+ NULL
};
type = g_type_register_static (G_TYPE_OBJECT, "XfburnSettings", &our_info, 0);
Modified: xfburn/trunk/xfburn/xfburn-welcome-tab.c
===================================================================
--- xfburn/trunk/xfburn/xfburn-welcome-tab.c 2008-09-13 23:44:05 UTC (rev 5402)
+++ xfburn/trunk/xfburn/xfburn-welcome-tab.c 2008-09-14 08:32:03 UTC (rev 5403)
@@ -85,6 +85,7 @@
sizeof (XfburnWelcomeTab),
0,
(GInstanceInitFunc) xfburn_welcome_tab_init,
+ NULL
};
type = g_type_register_static (GTK_TYPE_VBOX, "XfburnWelcomeTab", &our_info, 0);
More information about the Goodies-commits
mailing list