[Xfce4-commits] <parole:master> Fix some build warnings in enable-debug. Fix for bug #9196. Fix for bug #9219.

[Sean Davis]

Updating branch refs/heads/master
         to 6aa1fa5c6dfe89b9150668386071bebdb1873b7e (commit)
       from efb29b357d3cee136d788526a7cca070a374ffe0 (commit)

commit 6aa1fa5c6dfe89b9150668386071bebdb1873b7e
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Wed Aug 15 09:30:20 2012 -0400

    Fix some build warnings in enable-debug.  Fix for bug #9196.  Fix for bug #9219.

 configure.ac.in             |   12 +++++++++++-
 data/interfaces/Makefile.am |    6 ++++--
 docs/plugin-api/Makefile.am |    2 +-
 src/parole-disc.c           |    2 +-
 src/parole-player.c         |    5 +++--
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 8ca191e..799508b 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -15,7 +15,17 @@ AC_CONFIG_MACRO_DIR([m4])
 
 AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar])
 AM_CONFIG_HEADER([config.h])
-AM_MAINTAINER_MODE()
+
+if test x${enable_gtk_doc} = x"yes"; then 
+	AM_MAINTAINER_MODE([enable])
+else
+	if test x${enable_debug} != x"no"; then 
+		AM_MAINTAINER_MODE([enable])
+	else
+		AM_MAINTAINER_MODE()
+	fi
+fi
+
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AC_USE_SYSTEM_EXTENSIONS()
diff --git a/data/interfaces/Makefile.am b/data/interfaces/Makefile.am
index 93aba6f..f17d0ed 100644
--- a/data/interfaces/Makefile.am
+++ b/data/interfaces/Makefile.am
@@ -10,6 +10,7 @@ interfaces =					\
 interfaces_h = 					\
 	$(interfaces:.ui=_ui.h)
 
+if MAINTAINER_MODE
 BUILT_SOURCES = $(interfaces_h)
 
 parole_ui.h: parole.ui
@@ -33,9 +34,10 @@ open-location_ui.h: open-location.ui
 plugins_ui.h: plugins.ui
 	xdt-csource --static --strip-comments --strip-content --name=plugins_ui $< > $@
 
-
-CLEANFILES =					\
+DISTCLEANFILES =					\
 	$(interfaces_h)
+	
+endif
 
 EXTRA_DIST =					\
 	$(interfaces)				\
diff --git a/docs/plugin-api/Makefile.am b/docs/plugin-api/Makefile.am
index dd07724..117a40d 100644
--- a/docs/plugin-api/Makefile.am
+++ b/docs/plugin-api/Makefile.am
@@ -68,7 +68,7 @@ GTKDOC_CFLAGS=                  \
         $(GLIB_CFLAGS)          \
         $(GOBJECT_CFLAGS)       \
 	$(TAGLIBC_CFLAGS)	\
-        -I$(top_builddir)/parole
+        -I$(top_builddir)/src/misc
 
 GTKDOC_LIBS=                    \
 	$(GTK_LIBS)		\
diff --git a/src/parole-disc.c b/src/parole-disc.c
index 6827f02..3c5d729 100644
--- a/src/parole-disc.c
+++ b/src/parole-disc.c
@@ -172,7 +172,7 @@ parole_disc_add_mount_to_menu (ParoleDisc *disc, GMount *mount, const gchar *dev
     GFile *file;
     gchar **content_type;
     guint i;
-    ParoleDiscKind kind;
+    ParoleDiscKind kind = PAROLE_DISC_UNKNOWN;
     gchar *uri = NULL;
     
     file = g_mount_get_root (mount);
diff --git a/src/parole-player.c b/src/parole-player.c
index 7f9aebf..0af6a6f 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -2659,7 +2659,7 @@ void parole_player_set_subtitle_radio_menu_item_selected(ParolePlayer *player, g
 
 void parole_player_audiotrack_radio_menu_item_changed_cb(GtkWidget *widget, ParolePlayer *player)
 {
-	gint radio_index;
+	gint radio_index = 0;
 	GList *menu_items, *menu_iter;
 	gint counter = 0;
 	gint combobox_index;
@@ -2683,7 +2683,8 @@ void parole_player_audiotrack_radio_menu_item_changed_cb(GtkWidget *widget, Paro
 
 void parole_player_subtitles_radio_menu_item_changed_cb(GtkWidget *widget, ParolePlayer *player)
 {
-	gint radio_index, combobox_index; 
+	gint radio_index = 0;
+	gint combobox_index = 0; 
 	gint counter = 0;
 	
 	GList *menu_items, *menu_iter;