[Xfce4-commits] parole:master Port from libxfcegui4 to libxfce4ui
Updating branch refs/heads/master
to 124892a90fa2e5d09ced6a1d6ac5e249eb14b22d (commit)
from 6092d3948b20170f06abd1e7c02a243dde57d49b (commit)
commit 124892a90fa2e5d09ced6a1d6ac5e249eb14b22d
Author: Simon Steinbeiss och...@xfce.org
Date: Wed Jul 18 20:22:08 2012 +0200
Port from libxfcegui4 to libxfce4ui
configure.ac.in |4 +-
src/Makefile.am |7 +-
src/gst/Makefile.am |2 +-
src/gst/parole-gst.c | 15 ++--
src/main.c | 15 +---
src/parole-about.c | 110 +-
src/parole-about.h |2 +-
src/parole-player.c | 153 ++--
src/parole-player.h |2 +-
src/parole-plugins-manager.c |7 +-
src/parole-session.c | 178 --
src/parole-session.h | 61 --
12 files changed, 209 insertions(+), 347 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index 93cbd7d..029db4b 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -75,7 +75,7 @@ m4_define([gstreamer_minimum_version], [0.10.11])
m4_define([dbus_minimum_version], [0.60])
m4_define([dbus_glib_minimum_version], [0.70])
-m4_define([libxfcegui4_minimum_version],[4.6.0])
+m4_define([libxfce4ui_minimum_version],[4.7.0])
m4_define([libxfce4util_minimum_version],[4.6.0])
m4_define([libnotify_minimum_version], [0.4.1])
@@ -95,7 +95,7 @@ XDT_CHECK_PACKAGE([GST_INTERFACES],
[gstreamer-interfaces-0.10], [gstreamer_mini
XDT_CHECK_PACKAGE([DBUS], [dbus-1], [dbus_minimum_version])
XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [dbus_glib_minimum_version])
-XDT_CHECK_PACKAGE([LIBXFCE4GUI],
[libxfcegui4-1.0],[libxfcegui4_minimum_version])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1],[libxfce4ui_minimum_version])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL],
[libxfce4util-1.0],[libxfce4util_minimum_version])
#===#
diff --git a/src/Makefile.am b/src/Makefile.am
index 4c480e3..8469028 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,6 +15,7 @@ INCLUDES =\
-I$(top_srcdir)/src/dbus\
-I$(top_srcdir)/src/common \
-DLOCALEDIR=\$(localedir)\\
+ -DDESKTOPDIR=\$(datadir)/applications\\
-DG_LOG_DOMAIN=\parole\ \
-DPAROLE_PLUGINS_DIR=\$(libdir)/parole-$(PAROLE_VERSION_API)\\
-DPAROLE_PLUGINS_DATA_DIR=\$(datadir)/src/misc/parole-plugins-$(PAROLE_VERSION_API)\\
@@ -23,7 +24,7 @@ INCLUDES =\
$(GIO_CFLAGS) \
$(GMODULE_CFLAGS) \
$(DBUS_GLIB_CFLAGS) \
-$(LIBXFCE4GUI_CFLAGS) \
+$(LIBXFCE4UI_CFLAGS) \
$(GST_VIDEO_CFLAGS) \
$(GST_INTERFACES_CFLAGS)\
$(TAGLIBC_CFLAGS)
@@ -69,8 +70,6 @@ parole_SOURCES = \
parole-open-location.h \
parole-disc-menu.c \
parole-disc-menu.h \
- parole-session.c\
- parole-session.h\
parole-button.c \
parole-button.h \
parole-plugin-player.c \
@@ -86,7 +85,7 @@ parole_LDADD =
\
$(GIO_LIBS) \
$(GMODULE_LIBS) \
$(DBUS_GLIB_LIBS) \
-$(LIBXFCE4GUI_LIBS) \
+$(LIBXFCE4UI_LIBS) \
$(GST_VIDEO_LIBS) \
$(GST_INTERFACES_LIBS) \
$(TAGLIBC_LIBS)
diff --git a/src/gst/Makefile.am b/src/gst/Makefile.am
index 299b7d5..30e7c08 100644
--- a/src/gst/Makefile.am
+++ b/src/gst/Makefile.am
@@ -25,7 +25,7 @@ libparolegst_la_CFLAGS = \
$(GST_VIDEO_CFLAGS) \
$(GST_INTERFACES_CFLAGS) \
$(GTHREAD_CFLAGS) \
- $(LIBXFCE4GUI_CFLAGS)
+ $(LIBXFCE4UI_CFLAGS)
libparolegst_la_LIBADD = \
$(top_builddir)/src/misc/libparole.la\
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index ad9f6d9..344869e 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -34,7 +34,7 @@
#include gst/video/video.h
#include libxfce4util/libxfce4util.h
-#include libxfcegui4/libxfcegui4.h
+#include libxfce4ui/libxfce4ui.h
#include gdk/gdkx.h
@@ -1491,12 +1491,11 @@ parole_gst_check_state_change_timeout (gpointer data)
if ( gst-priv-state != gst-priv-target )
{
- gboolean ret_val = 1;
- /*FIXME gboolean ret_val =
[Xfce4-commits] parole:master Port from libxfcegui4 to libxfce4ui
Updating branch refs/heads/master
to b8864ba67406985513533b3e14d26ab6983240d7 (commit)
from ccf872eadb7ea5ff8227b3a761ae8a43101e5ae9 (commit)
commit b8864ba67406985513533b3e14d26ab6983240d7
Author: Simon Steinbeiss och...@xfce.org
Date: Wed Jul 18 20:22:08 2012 +0200
Port from libxfcegui4 to libxfce4ui
configure.ac.in |4 +-
src/Makefile.am |7 +-
src/gst/Makefile.am |2 +-
src/gst/parole-gst.c | 15 ++--
src/main.c | 15 +---
src/parole-about.c | 110 +-
src/parole-about.h |2 +-
src/parole-player.c | 153 ++--
src/parole-player.h |2 +-
src/parole-plugins-manager.c |7 +-
src/parole-session.c | 178 --
src/parole-session.h | 61 --
12 files changed, 209 insertions(+), 347 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index 93cbd7d..029db4b 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -75,7 +75,7 @@ m4_define([gstreamer_minimum_version], [0.10.11])
m4_define([dbus_minimum_version], [0.60])
m4_define([dbus_glib_minimum_version], [0.70])
-m4_define([libxfcegui4_minimum_version],[4.6.0])
+m4_define([libxfce4ui_minimum_version],[4.7.0])
m4_define([libxfce4util_minimum_version],[4.6.0])
m4_define([libnotify_minimum_version], [0.4.1])
@@ -95,7 +95,7 @@ XDT_CHECK_PACKAGE([GST_INTERFACES],
[gstreamer-interfaces-0.10], [gstreamer_mini
XDT_CHECK_PACKAGE([DBUS], [dbus-1], [dbus_minimum_version])
XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [dbus_glib_minimum_version])
-XDT_CHECK_PACKAGE([LIBXFCE4GUI],
[libxfcegui4-1.0],[libxfcegui4_minimum_version])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1],[libxfce4ui_minimum_version])
XDT_CHECK_PACKAGE([LIBXFCE4UTIL],
[libxfce4util-1.0],[libxfce4util_minimum_version])
#===#
diff --git a/src/Makefile.am b/src/Makefile.am
index 4c480e3..8469028 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,6 +15,7 @@ INCLUDES =\
-I$(top_srcdir)/src/dbus\
-I$(top_srcdir)/src/common \
-DLOCALEDIR=\$(localedir)\\
+ -DDESKTOPDIR=\$(datadir)/applications\\
-DG_LOG_DOMAIN=\parole\ \
-DPAROLE_PLUGINS_DIR=\$(libdir)/parole-$(PAROLE_VERSION_API)\\
-DPAROLE_PLUGINS_DATA_DIR=\$(datadir)/src/misc/parole-plugins-$(PAROLE_VERSION_API)\\
@@ -23,7 +24,7 @@ INCLUDES =\
$(GIO_CFLAGS) \
$(GMODULE_CFLAGS) \
$(DBUS_GLIB_CFLAGS) \
-$(LIBXFCE4GUI_CFLAGS) \
+$(LIBXFCE4UI_CFLAGS) \
$(GST_VIDEO_CFLAGS) \
$(GST_INTERFACES_CFLAGS)\
$(TAGLIBC_CFLAGS)
@@ -69,8 +70,6 @@ parole_SOURCES = \
parole-open-location.h \
parole-disc-menu.c \
parole-disc-menu.h \
- parole-session.c\
- parole-session.h\
parole-button.c \
parole-button.h \
parole-plugin-player.c \
@@ -86,7 +85,7 @@ parole_LDADD =
\
$(GIO_LIBS) \
$(GMODULE_LIBS) \
$(DBUS_GLIB_LIBS) \
-$(LIBXFCE4GUI_LIBS) \
+$(LIBXFCE4UI_LIBS) \
$(GST_VIDEO_LIBS) \
$(GST_INTERFACES_LIBS) \
$(TAGLIBC_LIBS)
diff --git a/src/gst/Makefile.am b/src/gst/Makefile.am
index 299b7d5..30e7c08 100644
--- a/src/gst/Makefile.am
+++ b/src/gst/Makefile.am
@@ -25,7 +25,7 @@ libparolegst_la_CFLAGS = \
$(GST_VIDEO_CFLAGS) \
$(GST_INTERFACES_CFLAGS) \
$(GTHREAD_CFLAGS) \
- $(LIBXFCE4GUI_CFLAGS)
+ $(LIBXFCE4UI_CFLAGS)
libparolegst_la_LIBADD = \
$(top_builddir)/src/misc/libparole.la\
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index ad9f6d9..344869e 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -34,7 +34,7 @@
#include gst/video/video.h
#include libxfce4util/libxfce4util.h
-#include libxfcegui4/libxfcegui4.h
+#include libxfce4ui/libxfce4ui.h
#include gdk/gdkx.h
@@ -1491,12 +1491,11 @@ parole_gst_check_state_change_timeout (gpointer data)
if ( gst-priv-state != gst-priv-target )
{
- gboolean ret_val = 1;
- /*FIXME gboolean ret_val =
