GNOME.org
 

totem r5753 - in trunk: . bindings/python browser-plugin lib src src/backend src/plugins src/plugins/bemused src/plugins/galago src/plugins/gromit src/plugins/lirc src/plugins/media-player-keys src/plugins/mythtv src/plugins/ontop src/plugins/properties src/plugins/publish src/plugins/sample-vala src/plugins/screensaver src/plugins/sidebar-test src/plugins/skipto src/plugins/thumbnail src/plugins/tracker

Author: hadess
Date: Tue Oct  7 15:16:32 2008
New Revision: 5753
URL: http://svn.gnome.org/viewvc/totem?rev=5753&view=rev

Log:
2008-10-07  Bastien Nocera  <hadess hadess net>

	* bindings/python/Makefile.am:
	* browser-plugin/Makefile.am:
	* configure.in:
	* lib/Makefile.am:
	* src/Makefile.am:
	* src/backend/Makefile.am:
	* src/plugins/Makefile.am:
	* src/plugins/bemused/Makefile.am:
	* src/plugins/galago/Makefile.am:
	* src/plugins/gromit/Makefile.am:
	* src/plugins/lirc/Makefile.am:
	* src/plugins/media-player-keys/Makefile.am:
	* src/plugins/mythtv/Makefile.am:
	* src/plugins/ontop/Makefile.am:
	* src/plugins/properties/Makefile.am:
	* src/plugins/publish/Makefile.am:
	* src/plugins/sample-vala/Makefile.am:
	* src/plugins/screensaver/Makefile.am:
	* src/plugins/sidebar-test/Makefile.am:
	* src/plugins/skipto/Makefile.am:
	* src/plugins/skipto/totem-skipto.c:
	* src/plugins/thumbnail/Makefile.am:
	* src/plugins/tracker/Makefile.am:
	* src/totem-interface.c (totem_interface_error),
	(totem_interface_error_with_link):
	* src/totem-options.c (option_version_cb):
	* src/totem-session.c (totem_save_state_cb), (totem_quit_cb),
	(totem_session_setup), (totem_session_restore):
	* src/totem.c (about_url_hook), (about_email_hook), (main):
	* src/update-from-egg.sh: Big patch from Christian Persch
	<chpe gnome org> to remove the libgnome dependencies
	(Closes: #554226)



Modified:
   trunk/ChangeLog
   trunk/bindings/python/Makefile.am
   trunk/browser-plugin/Makefile.am
   trunk/configure.in
   trunk/lib/Makefile.am
   trunk/src/Makefile.am
   trunk/src/backend/Makefile.am
   trunk/src/plugins/Makefile.am
   trunk/src/plugins/bemused/Makefile.am
   trunk/src/plugins/galago/Makefile.am
   trunk/src/plugins/gromit/Makefile.am
   trunk/src/plugins/lirc/Makefile.am
   trunk/src/plugins/media-player-keys/Makefile.am
   trunk/src/plugins/mythtv/Makefile.am
   trunk/src/plugins/ontop/Makefile.am
   trunk/src/plugins/properties/Makefile.am
   trunk/src/plugins/publish/Makefile.am
   trunk/src/plugins/sample-vala/Makefile.am
   trunk/src/plugins/screensaver/Makefile.am
   trunk/src/plugins/sidebar-test/Makefile.am
   trunk/src/plugins/skipto/Makefile.am
   trunk/src/plugins/skipto/totem-skipto.c
   trunk/src/plugins/thumbnail/Makefile.am
   trunk/src/plugins/tracker/Makefile.am
   trunk/src/totem-interface.c
   trunk/src/totem-options.c
   trunk/src/totem-session.c
   trunk/src/totem.c
   trunk/src/update-from-egg.sh

Modified: trunk/bindings/python/Makefile.am
==============================================================================
--- trunk/bindings/python/Makefile.am	(original)
+++ trunk/bindings/python/Makefile.am	Tue Oct  7 15:16:32 2008
@@ -10,7 +10,7 @@
 	-module -avoid-version
 
 totem_python_la_LIBADD = \
-	$(EXTRA_GNOME_LIBS)	\
+	$(DEPENDENCY_LIBS)	\
 	$(PYTHON_LIBS)		\
 	$(PYTHON_EXTRA_LIBS)	\
 	$(PYGTK_LIBS)
@@ -19,7 +19,7 @@
 	-I$(top_srcdir)			\
 	-I$(top_srcdir)/src		\
 	-I$(top_srcdir)/src/plugins	\
-	$(EXTRA_GNOME_CFLAGS)		\
+	$(DEPENDENCY_CFLAGS)		\
 	$(PYGTK_CFLAGS)			\
 	$(PYTHON_CFLAGS)		\
 	$(AM_CFLAGS)			\

Modified: trunk/browser-plugin/Makefile.am
==============================================================================
--- trunk/browser-plugin/Makefile.am	(original)
+++ trunk/browser-plugin/Makefile.am	Tue Oct  7 15:16:32 2008
@@ -35,12 +35,12 @@
 	$(AM_CPPFLAGS)
 
 libtotembrowserplugin_helper_la_CFLAGS =	\
-	$(EXTRA_GNOME_CFLAGS)		\
+	$(DEPENDENCY_CFLAGS)		\
 	$(WARN_CFLAGS)			\
 	$(AM_CFLAGS)
 
 libtotembrowserplugin_helper_la_LIBADD = 	\
-	$(EXTRA_GNOME_CFLAGS)			\
+	$(DEPENDENCY_CFLAGS)			\
 	$(WARN_CFLAGS)				\
 	$(AM_CFLAGS)
 
@@ -55,10 +55,10 @@
 
 test_glow_button_LDADD = \
 	libtotembrowserplugin_helper.la		\
-	$(EXTRA_GNOME_LIBS)
+	$(DEPENDENCY_LIBS)
 
 test_glow_button_CFLAGS =	\
-	$(EXTRA_GNOME_CFLAGS)	\
+	$(DEPENDENCY_CFLAGS)	\
 	$(WARN_CFLAGS)		\
 	$(AM_CFLAGS)
 
@@ -99,7 +99,7 @@
 	$(AM_CPPFLAGS)
 
 totem_plugin_viewer_CFLAGS = \
-	$(EXTRA_GNOME_CFLAGS)	\
+	$(DEPENDENCY_CFLAGS)	\
 	$(WARN_CFLAGS)		\
 	$(DBUS_CFLAGS)		\
 	$(NVTV_CFLAGS)		\
@@ -111,7 +111,7 @@
 	$(top_builddir)/src/libtotem_player.la				\
 	$(top_builddir)/lib/libtotemscrsaver.la				\
 	libtotembrowserplugin_helper.la					\
-	$(EXTRA_GNOME_LIBS)	\
+	$(DEPENDENCY_LIBS)	\
 	$(SN_LIBS)		\
 	$(XVIDMODE_LIBS) 	\
 	$(DBUS_LIBS)		\

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Oct  7 15:16:32 2008
@@ -233,43 +233,53 @@
 	ISO_CODES=""
 fi
 
-dnl Check for GTK+ only build
-AC_ARG_ENABLE(gtk,
-	AC_HELP_STRING([--enable-gtk],[compile a gtk+ only version]),
-	[case "${enableval}" in
-	yes) ENABLE_GTK=yes ;;
-	no) ENABLE_GTK=no ;;
-	*) AC_MSG_ERROR(bad value ${enableval} for --disable-gtk) ;;
-	esac],
-	[ENABLE_GTK=no]) dnl Default value
+dnl Check the smclient backend
+GDK_TARGET="$($PKG_CONFIG --variable target gdk-2.0)"
 
-dnl Seems that the order matters because libtool blows
-dnl Also check if we're going to be using GTK+ only
-if test x$ENABLE_GTK = "xno" ; then
-# FIXME: use gmodule-no-export instead!
-	PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gio-2.0 libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES)
-	HAVE_GNOME=yes
-else
-# FIXME: use gmodule-no-export instead!
-	PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gio-2.0 gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 gconf-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES)
-	AC_DEFINE(USE_STABLE_LIBGNOMEUI, 1, [defined if we don't have GNOME])
-	AC_DEFINE(HAVE_GTK_ONLY, 1, [defined if GNOME isn't used])
-	HAVE_GNOME=no
-fi
+SMCLIENT_PKGS=
+AC_MSG_CHECKING([which smclient backend to use])
+AC_ARG_WITH([smclient],
+  [AS_HELP_STRING([--with-smclient],[which smclient backend to use (xsmp/win32/quartz)])],
+  [],
+  [case "$GDK_TARGET" in
+    x11) with_smclient=xsmp SMCLIENT_PKGS="sm" ;;
+    win32|quartz) with_smclient=$GDK_TARGET ;;
+    *) with_smclient=no ;;
+   esac])
+AC_MSG_RESULT([$with_smclient])
+
+if test "$with_smclient" != "no"; then
+  PKG_CHECK_MODULES([SMCLIENT],[$SMCLIENT_PKGS])
+  AC_DEFINE([WITH_SMCLIENT],[1],[Define if smclient is enabled])
+fi
+
+AM_CONDITIONAL([WITH_SMCLIENT],[test "$with_smclient" != "no"])
+AM_CONDITIONAL([WITH_SMCLIENT_XSMP],[test "$with_smclient" = "xsmp"])
+AM_CONDITIONAL([WITH_SMCLIENT_WIN32],[test "$with_smclient" = "win32"])
+AM_CONDITIONAL([WITH_SMCLIENT_QUARTZ],[test "$with_smclient" = "quartz"])
+
+dnl Pkg-config checks
+
+PKG_CHECK_MODULES([DEPENDENCY],[
+  glib-2.0 >= $GLIB_REQS
+  gio-2.0
+  gtk+-2.0 >= $GTK_REQS
+  gmodule-2.0
+  gconf-2.0
+  totem-plparser >= $TOTEM_PLPARSER_REQS])
 
 PKG_CHECK_MODULES(MM, $MM)
 
-AM_CONDITIONAL(HAVE_GNOME, test x$HAVE_GNOME = "xyes")
-EXTRA_GNOME_CFLAGS="$EXTRA_GNOME_CFLAGS"
-EXTRA_GNOME_LIBS="$EXTRA_GNOME_LIBS $EXTRA_BACKEND_LIBS"
-AC_SUBST(EXTRA_GNOME_CFLAGS)
-AC_SUBST(EXTRA_GNOME_LIBS)
-
-PKG_CHECK_MODULES(GTK, gtk+-2.0 gthread-2.0)
-AC_SUBST(GTK_CFLAGS)
+PKG_CHECK_MODULES([GTK],[gtk+-2.0 gthread-2.0])
 GTK_LIBS="$GTK_LIBS $EXTRA_BACKEND_LIBS"
 AC_SUBST(GTK_LIBS)
 
+AC_SUBST([EXTRA_BACKEND_LIBS])
+
+PKG_CHECK_EXISTS([
+  $ISO_CODES
+  gnome-icon-theme >= $GNOMEICON_REQS])
+
 dnl *************************
 dnl X11 related functionality
 dnl *************************
@@ -515,6 +525,9 @@
 	add_plugin="1"
 
 	case ${plugin} in
+		screensaver)
+			PKG_CHECK_MODULES(SCREENSAVER, gconf-2.0)
+		;;
 		galago)
 			PKG_CHECK_MODULES(LIBGALAGO, libgalago >= 0.5.2,
 				[HAVE_LIBGALAGO=yes], [HAVE_LIBGALAGO=no])
@@ -552,7 +565,7 @@
 			fi
 		;;
 		mythtv)
-			PKG_CHECK_MODULES(GMYTH, gmyth >= 0.7.1 gmyth-upnp >= 0.7.1,
+			PKG_CHECK_MODULES(GMYTH, gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0,
 					  [HAVE_GMYTH=yes], [HAVE_GMYTH=no])
 			if test "${HAVE_GMYTH}" != "yes"; then
 				plugin_error_or_ignore "you need GMyth >= 0.7 installed for the MythTV plugin"
@@ -902,11 +915,6 @@
 else
 	AC_MSG_NOTICE([   nvtv support disabled])
 fi
-if test x$ENABLE_GTK = xyes ; then
-	AC_MSG_NOTICE([** GTK+-only version enabled])
-else
-	AC_MSG_NOTICE([** GNOME version enabled])
-fi
 if test x$enable_python = xyes ; then
 	AC_MSG_NOTICE([** Python binding support enabled])
 else
@@ -998,6 +1006,11 @@
 else
 	AC_MSG_NOTICE([   XFree86 multimedia keys support disabled])
 fi
+if test "$with_smclient" != "no" ; then
+	AC_MSG_NOTICE([** SM client support enabled])
+else
+	AC_MSG_NOTICE([   SM client support disabled])
+fi
 
 AC_MSG_NOTICE([End options])
 

Modified: trunk/lib/Makefile.am
==============================================================================
--- trunk/lib/Makefile.am	(original)
+++ trunk/lib/Makefile.am	Tue Oct  7 15:16:32 2008
@@ -18,7 +18,7 @@
 
 libtotemscrsaver_la_CFLAGS =				\
 	$(common_defines)				\
-	$(EXTRA_GNOME_CFLAGS)				\
+	$(DEPENDENCY_CFLAGS)				\
 	$(WARN_CFLAGS)					\
 	$(DBUS_CFLAGS)					\
 	$(AM_CFLAGS)

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Tue Oct  7 15:16:32 2008
@@ -33,7 +33,7 @@
 	$(AM_CPPFLAGS)
 
 libbaconmessageconnection_la_CFLAGS = \
-	$(EXTRA_GNOME_CFLAGS)	\
+	$(GTK_CFLAGS)		\
 	$(WARN_CFLAGS)		\
 	$(DBUS_CFLAGS)		\
 	$(AM_CFLAGS)
@@ -65,7 +65,7 @@
 	$(AM_CPPFLAGS)
 
 libtotem_player_la_CFLAGS = \
-	$(EXTRA_GNOME_CFLAGS)	\
+	$(DEPENDENCY_CFLAGS)	\
 	$(WARN_CFLAGS)		\
 	$(AM_CFLAGS)
 
@@ -129,7 +129,7 @@
 
 totem_CFLAGS = \
 	$(WARN_CFLAGS)			\
-	$(EXTRA_GNOME_CFLAGS)		\
+	$(DEPENDENCY_CFLAGS)		\
 	$(DBUS_CFLAGS)			\
 	$(NVTV_CFLAGS)			\
 	$(MISSING_PLUGINS_CFLAGS) \
@@ -143,13 +143,36 @@
 	plugins/libtotemmodule.la			\
 	libbaconmessageconnection.la			\
 	libtotem_player.la				\
-	$(EXTRA_GNOME_LIBS)				\
+	$(DEPENDENCY_LIBS)				\
 	$(XVIDMODE_LIBS)				\
 	$(NVTV_LIBS)					\
 	$(DBUS_LIBS)					\
 	$(XTEST_LIBS)					\
 	$(X_LIBS)
 
+if WITH_SMCLIENT
+totem_SOURCES += \
+	eggdesktopfile.c \
+	eggdesktopfile.h \
+	eggsmclient.c \
+	eggsmclient.h \
+	eggsmclient-private.h \
+	$(NULL)
+totem_CFLAGS += $(SMCLIENT_CFLAGS)
+totem_LDADD += $(SMCLIENT_LIBS)
+
+if WITH_SMCLIENT_XSMP
+totem_SOURCES += eggsmclient-xsmp.c
+totem_CPPFLAGS += -DEGG_SM_CLIENT_BACKEND_XSMP
+endif
+if WITH_SMCLIENT_WIN32
+totem_SOURCES += eggsmclient-win32.c
+endif
+if WITH_SMCLIENT_QUARTZ
+totem_SOURCES += eggsmclient-osx.c
+endif
+endif
+
 if ENABLE_PYTHON
 totem_LDADD += \
 	$(PYTHON_LIBS)			\
@@ -170,7 +193,7 @@
 	$(AM_CPPFLAGS)
 
 totem_video_thumbnailer_CFLAGS = \
-	$(EXTRA_GNOME_CFLAGS)	\
+	$(DEPENDENCY_CFLAGS)	\
 	$(WARN_CFLAGS)		\
 	$(NVTV_CFLAGS)		\
 	$(AM_CFLAGS)
@@ -180,8 +203,8 @@
 
 totem_video_thumbnailer_LDADD =			\
 	backend/libbaconvideowidget.la		\
-	$(GTK_LIBS) 				\
-	$(EXTRA_GNOME_LIBS)			\
+	$(DEPENDENCY_LIBS)			\
+	$(EXTRA_BACKEND_LIBS) 			\
 	$(NVTV_LIBS)				\
 	$(XTEST_LIBS)				\
 	$(XVIDMODE_LIBS)			\
@@ -209,7 +232,7 @@
 
 libtotem_properties_page_la_CFLAGS = \
 	$(WARN_CFLAGS)		\
-	$(EXTRA_GNOME_CFLAGS)	\
+	$(DEPENDENCY_CFLAGS)	\
 	$(NAUTILUS_CFLAGS)	\
 	$(NVTV_CFLAGS)		\
 	$(AM_CFLAGS)
@@ -222,7 +245,7 @@
 	backend/libbaconvideowidget.la				\
 	plugins/properties/libbaconvideowidgetproperties.la	\
 	libtotem_player.la					\
-	$(EXTRA_GNOME_LIBS)					\
+	$(DEPENDENCY_LIBS)					\
 	$(NAUTILUS_LIBS)					\
 	$(NVTV_LIBS)						\
 	$(XTEST_LIBS)						\
@@ -247,7 +270,7 @@
 
 test_properties_page_CFLAGS = \
 	$(WARN_CFLAGS)		\
-	$(EXTRA_GNOME_CFLAGS)	\
+	$(DEPENDENCY_CFLAGS)	\
 	$(NAUTILUS_CFLAGS)	\
 	$(NVTV_CFLAGS)		\
 	$(AM_CFLAGS)
@@ -259,7 +282,7 @@
 	backend/libbaconvideowidget.la				\
 	plugins/properties/libbaconvideowidgetproperties.la	\
 	libtotem_player.la					\
-	$(EXTRA_GNOME_LIBS)					\
+	$(DEPENDENCY_LIBS)					\
 	$(NAUTILUS_LIBS)					\
 	$(NVTV_LIBS)						\
 	$(XTEST_LIBS)						\
@@ -284,7 +307,7 @@
 
 totem_video_indexer_CFLAGS = \
 	$(WARN_CFLAGS)		\
-	$(EXTRA_GNOME_CFLAGS)	\
+	$(DEPENDENCY_CFLAGS)	\
 	$(NVTV_CFLAGS)		\
 	$(AM_CFLAGS)
 
@@ -293,8 +316,8 @@
 
 totem_video_indexer_LDADD = \
 	backend/libbaconvideowidget.la	\
-	$(EXTRA_GNOME_LIBS)		\
-	$(GTK_LIBS)			\
+	$(DEPENDENCY_LIBS)		\
+	$(EXTRA_BACKEND_LIBS)		\
 	$(NVTV_LIBS)			\
 	$(XTEST_LIBS)			\
 	$(XVIDMODE_LIBS)		\
@@ -315,7 +338,7 @@
 
 totem_audio_preview_CFLAGS = \
 	$(WARN_CFLAGS)		\
-	$(EXTRA_GNOME_CFLAGS)	\
+	$(DEPENDENCY_CFLAGS)	\
 	$(NVTV_CFLAGS)		\
 	$(AM_CFLAGS)
 
@@ -324,8 +347,8 @@
 
 totem_audio_preview_LDADD = \
 	backend/libbaconvideowidget.la	\
-	$(EXTRA_GNOME_LIBS)		\
-	$(GTK_LIBS)			\
+	$(DEPENDENCY_LIBS)		\
+	$(EXTRA_BACKEND_LIBS)		\
 	$(NVTV_LIBS)			\
 	$(XTEST_LIBS)			\
 	$(XVIDMODE_LIBS)		\

Modified: trunk/src/backend/Makefile.am
==============================================================================
--- trunk/src/backend/Makefile.am	(original)
+++ trunk/src/backend/Makefile.am	Tue Oct  7 15:16:32 2008
@@ -12,13 +12,13 @@
 	$(AM_CPPFLAGS)
 
 bvw_test_CFLAGS = \
-	$(EXTRA_GNOME_CFLAGS)	\
+	$(DEPENDENCY_CFLAGS)	\
 	$(AM_CFLAGS)		\
 	-I$(top_srcdir)/
 
 bvw_test_LDADD = \
 	libbaconvideowidget.la \
-	$(EXTRA_GNOME_LIBS) $(XVIDMODE_LIBS) $(XTEST_LIBS)
+	$(DEPENDENCY_LIBS) $(XVIDMODE_LIBS) $(XTEST_LIBS)
 
 BVWMARSHALFILES = baconvideowidget-marshal.c baconvideowidget-marshal.h
 GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
@@ -56,7 +56,7 @@
 	$(AM_CPPFLAGS)
 
 libbaconvideowidget_la_CFLAGS =		\
-	$(EXTRA_GNOME_CFLAGS)		\
+	$(DEPENDENCY_CFLAGS)		\
 	$(MM_CFLAGS)			\
 	$(MISSING_PLUGINS_CFLAGS)	\
 	$(NVTV_CFLAGS) 			\
@@ -69,7 +69,7 @@
 	$(MM_LIBS)		\
 	$(GST_LIBS)		\
 	$(NVTV_LIBS)		\
-	$(GTK_LIBS)		\
+	$(EXTRA_BACKEND_LIBS)	\
 	$(X_LIBS)		\
 	$(MISSING_PLUGINS_LIBS)
 

Modified: trunk/src/plugins/Makefile.am
==============================================================================
--- trunk/src/plugins/Makefile.am	(original)
+++ trunk/src/plugins/Makefile.am	Tue Oct  7 15:16:32 2008
@@ -31,7 +31,7 @@
 	$(AM_CPPFLAGS)
 
 libtotemmodule_la_CFLAGS = \
-	$(EXTRA_GNOME_CFLAGS)	\
+	$(DEPENDENCY_CFLAGS)	\
 	$(WARN_CFLAGS)		\
 	$(DBUS_CFLAGS)		\
 	$(AM_CFLAGS)		\
@@ -51,7 +51,7 @@
 SUBDIRS += totem
 
 libtotemmodule_la_LIBADD = \
-	$(EXTRA_GNOME_LIBS)	\
+	$(DEPENDENCY_LIBS)	\
 	$(PYTHON_LIBS)		\
 	$(PYTHON_EXTRA_LIBS)	\
 	$(PYGTK_LIBS)

Modified: trunk/src/plugins/bemused/Makefile.am
==============================================================================
--- trunk/src/plugins/bemused/Makefile.am	(original)
+++ trunk/src/plugins/bemused/Makefile.am	Tue Oct  7 15:16:32 2008
@@ -26,7 +26,7 @@
 libbemused_la_LIBADD = $(BEMUSED_LIBS)
 
 libbemused_la_CFLAGS =			\
-	$(EXTRA_GNOME_CFLAGS)		\
+	$(DEPENDENCY_CFLAGS)		\
 	$(WARN_CFLAGS)			\
 	$(BEMUSED_CFLAGS)		\
 	$(AM_CFLAGS)			\

Modified: trunk/src/plugins/galago/Makefile.am
==============================================================================
--- trunk/src/plugins/galago/Makefile.am	(original)
+++ trunk/src/plugins/galago/Makefile.am	Tue Oct  7 15:16:32 2008
@@ -26,7 +26,7 @@
 libtgp_la_CPPFLAGS = $(common_defines)
 
 libtgp_la_CFLAGS = \
-	$(EXTRA_GNOME_CFLAGS)	\
+	$(DEPENDENCY_CFLAGS)	\
 	$(LIBGALAGO_CFLAGS)	\
 	$(WARN_CFLAGS)		\
 	$(DBUS_CFLAGS)		\

Modified: trunk/src/plugins/gromit/Makefile.am
==============================================================================
--- trunk/src/plugins/gromit/Makefile.am	(original)
+++ trunk/src/plugins/gromit/Makefile.am	Tue Oct  7 15:16:32 2008
@@ -26,7 +26,7 @@
 libgromit_la_CPPFLAGS = $(common_defines)
 
 libgromit_la_CFLAGS = \
-	$(EXTRA_GNOME_CFLAGS)	\
+	$(DEPENDENCY_CFLAGS)	\
 	$(WARN_CFLAGS)		\
 	$(DBUS_CFLAGS)		\
 	$(AM_CFLAGS)		\

Modified: trunk/src/plugins/lirc/Makefile.am
==============================================================================
--- trunk/src/plugins/lirc/Makefile.am	(original)
+++ trunk/src/plugins/lirc/Makefile.am	Tue Oct  7 15:16:32 2008
@@ -29,7 +29,7 @@
 liblirc_la_CPPFLAGS = $(common_defines)
 
 liblirc_la_CFLAGS = \
-	$(EXTRA_GNOME_CFLAGS)	\
+	$(DEPENDENCY_CFLAGS)	\
 	$(WARN_CFLAGS)		\
 	$(DBUS_CFLAGS)		\
 	$(AM_CFLAGS)		\

Modified: trunk/src/plugins/media-player-keys/Makefile.am
==============================================================================
--- trunk/src/plugins/media-player-keys/Makefile.am	(original)
+++ trunk/src/plugins/media-player-keys/Makefile.am	Tue Oct  7 15:16:32 2008
@@ -26,7 +26,7 @@
 libmedia_player_keys_la_CPPFLAGS = $(common_defines)
 
 libmedia_player_keys_la_CFLAGS = \
-	$(EXTRA_GNOME_CFLAGS)	\
+	$(DEPENDENCY_CFLAGS)	\
 	$(MEDIA_PLAYER_KEYS_CFLAGS) \
 	$(WARN_CFLAGS)		\
 	$(DBUS_CFLAGS)		\

Modified: trunk/src/plugins/mythtv/Makefile.am
==============================================================================
--- trunk/src/plugins/mythtv/Makefile.am	(original)
+++ trunk/src/plugins/mythtv/Makefile.am	Tue Oct  7 15:16:32 2008
@@ -35,7 +35,7 @@
 libtotem_mythtv_la_LIBADD = $(GMYTH_LIBS)
 
 libtotem_mythtv_la_CFLAGS =	\
-	$(EXTRA_GNOME_CFLAGS)	\
+	$(DEPENDENCY_CFLAGS)	\
 	$(GMYTH_CFLAGS)		\
 	$(WARN_CFLAGS)		\
 	$(DBUS_CFLAGS)		\

Modified: trunk/src/plugins/ontop/Makefile.am
==============================================================================
--- trunk/src/plugins/ontop/Makefile.am	(original)
+++ trunk/src/plugins/ontop/Makefile.am	Tue Oct  7 15:16:32 2008
@@ -26,7 +26,7 @@
 libontop_la_CPPFLAGS = $(common_defines)
 
 libontop_la_CFLAGS = \
-	$(EXTRA_GNOME_CFLAGS)	\
+	$(DEPENDENCY_CFLAGS)	\
 	$(WARN_CFLAGS)		\
 	$(DBUS_CFLAGS)		\
 	$(AM_CFLAGS)		\

Modified: trunk/src/plugins/properties/Makefile.am
==============================================================================
--- trunk/src/plugins/properties/Makefile.am	(original)
+++ trunk/src/plugins/properties/Makefile.am	Tue Oct  7 15:16:32 2008
@@ -28,7 +28,7 @@
 libmovie_properties_la_CPPFLAGS = $(common_defines)
 
 libmovie_properties_la_CFLAGS = \
-	$(EXTRA_GNOME_CFLAGS)	\
+	$(DEPENDENCY_CFLAGS)	\
 	$(WARN_CFLAGS)		\
 	$(DBUS_CFLAGS)		\
 	$(AM_CFLAGS)		\
@@ -41,7 +41,7 @@
 	bacon-video-widget-properties.h
 
 libbaconvideowidgetproperties_la_CFLAGS =	\
-	$(EXTRA_GNOME_CFLAGS)			\
+	$(DEPENDENCY_CFLAGS)			\
 	$(WARN_CFLAGS)				\
 	$(DBUS_CFLAGS)				\
 	$(AM_CFLAGS)				\

Modified: trunk/src/plugins/publish/Makefile.am
==============================================================================
--- trunk/src/plugins/publish/Makefile.am	(original)
+++ trunk/src/plugins/publish/Makefile.am	Tue Oct  7 15:16:32 2008
@@ -29,7 +29,7 @@
 libpublish_la_CPPFLAGS = $(common_defines)
 
 libpublish_la_CFLAGS = \
-	$(EXTRA_GNOME_CFLAGS)	\
+	$(DEPENDENCY_CFLAGS)	\
 	$(WARN_CFLAGS)		\
 	$(DBUS_CFLAGS)		\
 	$(LIBEPC_CFLAGS)	\

Modified: trunk/src/plugins/sample-vala/Makefile.am
==============================================================================
--- trunk/src/plugins/sample-vala/Makefile.am	(original)
+++ trunk/src/plugins/sample-vala/Makefile.am	Tue Oct  7 15:16:32 2008
@@ -14,7 +14,7 @@
 install-pluginLTLIBRARIES:
 
 totem-sample-vala-plugin.c totem-sample-vala-plugin.h: totem-sample-vala-plugin.vala
-	$(VALAC) -C --vapidir=$(top_srcdir)/bindings/vala -X -I$(top_srcdir)/src/plugins -X -I$(top_srcdir)/src/ --pkg=totem -X "$(EXTRA_GNOME_CFLAGS)" $^
+	$(VALAC) -C --vapidir=$(top_srcdir)/bindings/vala -X -I$(top_srcdir)/src/plugins -X -I$(top_srcdir)/src/ --pkg=totem -X "$(DEPENDENCY_CFLAGS)" $^
 
 common_defines = \
 	-D_REENTRANT					\
@@ -32,7 +32,7 @@
 libsample_vala_la_CPPFLAGS = $(common_defines)
 
 libsample_vala_la_CFLAGS = \
-	$(EXTRA_GNOME_CFLAGS)	\
+	$(DEPENDENCY_CFLAGS)	\
 	$(WARN_CFLAGS)		\
 	$(DBUS_CFLAGS)		\
 	$(AM_CFLAGS)		\

Modified: trunk/src/plugins/screensaver/Makefile.am
==============================================================================
--- trunk/src/plugins/screensaver/Makefile.am	(original)
+++ trunk/src/plugins/screensaver/Makefile.am	Tue Oct  7 15:16:32 2008
@@ -26,10 +26,11 @@
 libscreensaver_la_CPPFLAGS = $(common_defines)
 
 libscreensaver_la_CFLAGS = \
-	$(EXTRA_GNOME_CFLAGS)	\
+	$(DEPENDENCY_CFLAGS)	\
 	$(WARN_CFLAGS)		\
 	$(DBUS_CFLAGS)		\
 	$(AM_CFLAGS)		\
+	$(SCREENSAVER_CFLAGS)	\
 	-I$(top_srcdir)/	\
 	-I$(top_srcdir)/lib	\
 	-I$(top_srcdir)/src	\

Modified: trunk/src/plugins/sidebar-test/Makefile.am
==============================================================================
--- trunk/src/plugins/sidebar-test/Makefile.am	(original)
+++ trunk/src/plugins/sidebar-test/Makefile.am	Tue Oct  7 15:16:32 2008
@@ -27,7 +27,7 @@
 libsidebar_test_la_CPPFLAGS = $(common_defines)
 
 libsidebar_test_la_CFLAGS = \
-	$(EXTRA_GNOME_CFLAGS)	\
+	$(DEPENDENCY_CFLAGS)	\
 	$(WARN_CFLAGS)		\
 	$(DBUS_CFLAGS)		\
 	$(AM_CFLAGS)		\

Modified: trunk/src/plugins/skipto/Makefile.am
==============================================================================
--- trunk/src/plugins/skipto/Makefile.am	(original)
+++ trunk/src/plugins/skipto/Makefile.am	Tue Oct  7 15:16:32 2008
@@ -34,7 +34,7 @@
 	-I$(top_srcdir)/plparse
 
 libskipto_la_CFLAGS = 			\
-	$(EXTRA_GNOME_CFLAGS)		\
+	$(DEPENDENCY_CFLAGS)		\
 	$(WARN_CFLAGS)			\
 	$(DBUS_CFLAGS)			\
 	$(AM_CFLAGS)			\

Modified: trunk/src/plugins/skipto/totem-skipto.c
==============================================================================
--- trunk/src/plugins/skipto/totem-skipto.c	(original)
+++ trunk/src/plugins/skipto/totem-skipto.c	Tue Oct  7 15:16:32 2008
@@ -31,7 +31,6 @@
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include <gconf/gconf-client.h>
 #include <string.h>
 #include <sys/types.h>
 #include <unistd.h>

Modified: trunk/src/plugins/thumbnail/Makefile.am
==============================================================================
--- trunk/src/plugins/thumbnail/Makefile.am	(original)
+++ trunk/src/plugins/thumbnail/Makefile.am	Tue Oct  7 15:16:32 2008
@@ -26,7 +26,7 @@
 libthumbnail_la_CPPFLAGS = $(common_defines)
 
 libthumbnail_la_CFLAGS = \
-	$(EXTRA_GNOME_CFLAGS)	\
+	$(DEPENDENCY_CFLAGS)	\
 	$(WARN_CFLAGS)		\
 	$(DBUS_CFLAGS)		\
 	$(AM_CFLAGS)		\

Modified: trunk/src/plugins/tracker/Makefile.am
==============================================================================
--- trunk/src/plugins/tracker/Makefile.am	(original)
+++ trunk/src/plugins/tracker/Makefile.am	Tue Oct  7 15:16:32 2008
@@ -26,7 +26,7 @@
 libtracker_la_CPPFLAGS = $(common_defines)
 
 libtracker_la_CFLAGS = \
-	$(EXTRA_GNOME_CFLAGS)	\
+	$(DEPENDENCY_CFLAGS)	\
 	$(TRACKER_CFLAGS)	\
 	$(WARN_CFLAGS)		\
 	$(DBUS_CFLAGS)		\

Modified: trunk/src/totem-interface.c
==============================================================================
--- trunk/src/totem-interface.c	(original)
+++ trunk/src/totem-interface.c	Tue Oct  7 15:16:32 2008
@@ -77,13 +77,10 @@
 
 	error_dialog = totem_interface_error_dialog (title, reason, parent);
 
-	g_signal_connect (G_OBJECT (error_dialog), "destroy", G_CALLBACK
-			(gtk_widget_destroy), error_dialog);
 	g_signal_connect (G_OBJECT (error_dialog), "response", G_CALLBACK
 			(gtk_widget_destroy), error_dialog);
-	gtk_window_set_modal (GTK_WINDOW (error_dialog), TRUE);
 
-	gtk_widget_show (error_dialog);
+	gtk_window_present (GTK_WINDOW (error_dialog));
 }
 
 void
@@ -151,13 +148,10 @@
 
 	gtk_dialog_set_default_response (GTK_DIALOG (error_dialog), GTK_RESPONSE_OK);
 
-	g_signal_connect (G_OBJECT (error_dialog), "destroy", G_CALLBACK
-			(gtk_widget_destroy), error_dialog);
 	g_signal_connect (G_OBJECT (error_dialog), "response", G_CALLBACK
 			(gtk_widget_destroy), error_dialog);
-	gtk_window_set_modal (GTK_WINDOW (error_dialog), TRUE);
 
-	gtk_widget_show_all (error_dialog);
+	gtk_window_present (GTK_WINDOW (error_dialog));
 }
 
 GtkBuilder *

Modified: trunk/src/totem-options.c
==============================================================================
--- trunk/src/totem-options.c	(original)
+++ trunk/src/totem-options.c	Tue Oct  7 15:16:32 2008
@@ -33,6 +33,18 @@
 
 TotemCmdLineOptions optionstate;	/* Decoded command line options */
 
+static gboolean
+option_version_cb (const gchar *option_name,
+	           const gchar *value,
+	           gpointer     data,
+	           GError     **error)
+{
+	g_print ("%s %s\n", PACKAGE, VERSION);
+
+	exit (0);
+	return FALSE;
+}
+ 
 const GOptionEntry options[] = {
 	{"debug", '\0', 0, G_OPTION_ARG_NONE, &optionstate.debug, N_("Enable debug"), NULL},
 	{"play-pause", '\0', 0, G_OPTION_ARG_NONE, &optionstate.playpause, N_("Play/Pause"), NULL},
@@ -54,6 +66,7 @@
 	{"printplaying", '\0', 0, G_OPTION_ARG_NONE, &optionstate.printplaying, N_("Print playing movie"), NULL},
 	{"seek", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_INT64, &optionstate.seek, N_("Seek"), NULL},
 	{"playlist-idx", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_DOUBLE, &optionstate.playlistidx, N_("Playlist index"), NULL},
+	{ "version", 0, G_OPTION_FLAG_NO_ARG | G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_CALLBACK, option_version_cb, NULL, NULL },
 	{G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_FILENAME_ARRAY, &optionstate.filenames, N_("Movies to play"), NULL},
 	{NULL} /* end the list */
 };

Modified: trunk/src/totem-session.c
==============================================================================
--- trunk/src/totem-session.c	(original)
+++ trunk/src/totem-session.c	Tue Oct  7 15:16:32 2008
@@ -27,9 +27,10 @@
 #include "totem-session.h"
 #include "totem-uri.h"
 
-#ifndef HAVE_GTK_ONLY
+#ifdef WITH_SMCLIENT
 
-#include <libgnomeui/gnome-client.h>
+#include <unistd.h>
+#include "eggsmclient.h"
 
 static char *
 totem_session_create_key (void)
@@ -46,18 +47,15 @@
 	return path;
 }
 
-static gboolean
-totem_save_yourself_cb (GnomeClient *client, int phase, GnomeSaveStyle style,
-		gboolean shutting_down, GnomeInteractStyle interact_style,
-		gboolean fast, Totem *totem)
+static void
+totem_save_state_cb (EggSMClient *client,
+	             GKeyFile *key_file,
+	             Totem *totem)
 {
 	char *argv[] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL };
 	int i = 0;
 	char *path_id, *current, *seek, *uri;
 
-	if (style == GNOME_SAVE_GLOBAL)
-		return TRUE;
-
 	path_id = totem_session_create_key ();
 	totem_playlist_save_current_playlist (totem->playlist, path_id);
 
@@ -65,7 +63,7 @@
 	argv[i++] = "rm";
 	argv[i++] = "-f";
 	argv[i++] = path_id;
-	gnome_client_set_discard_command (client, i, argv);
+	egg_sm_client_set_discard_command (client, i, (const char **) argv);
 
 	/* How to clone or restart */
 	i = 0;
@@ -82,19 +80,20 @@
 	uri = g_filename_to_uri (path_id, NULL, NULL);
 	argv[i++] = uri;
 
-	gnome_client_set_clone_command (client, i, argv);
-	gnome_client_set_restart_command (client, i, argv);
+	/* FIXME: what's this used for? */
+	/* egg_sm_client_set_clone_command (client, i, argv); */
+
+	egg_sm_client_set_restart_command (client, i, (const char **) argv);
 
 	g_free (path_id);
 	g_free (current);
 	g_free (seek);
 	g_free (uri);
-
-	return TRUE;
 }
 
 static void
-totem_client_die_cb (GnomeClient *client, Totem *totem)
+totem_quit_cb (EggSMClient *client,
+	       Totem *totem)
 {
 	totem_action_exit (totem);
 }
@@ -102,19 +101,17 @@
 void
 totem_session_setup (Totem *totem, char **argv)
 {
-	GnomeClient *client;
-	GnomeClientFlags flags;
+	EggSMClient *sm_client;
 
 	totem->argv0 = argv[0];
 
-	client = gnome_master_client ();
-	g_signal_connect (G_OBJECT (client), "save-yourself",
-			G_CALLBACK (totem_save_yourself_cb), totem);
-	g_signal_connect (G_OBJECT (client), "die",
-			G_CALLBACK (totem_client_die_cb), totem);
+	sm_client = egg_sm_client_get ();
+	g_signal_connect (sm_client, "save-state",
+	                  G_CALLBACK (totem_save_state_cb), totem);
+	g_signal_connect (sm_client, "quit",
+	                  G_CALLBACK (totem_quit_cb), totem);
 
-	flags = gnome_client_get_flags (client);
-	if (flags & GNOME_CLIENT_RESTORED)
+	if (egg_sm_client_is_resumed (sm_client))
 		totem->session_restored = TRUE;
 }
 
@@ -149,8 +146,6 @@
 
 	g_free (mrl);
 	g_free (subtitle);
-
-	return;
 }
 
 #else
@@ -165,4 +160,4 @@
 {
 }
 
-#endif /* !HAVE_GTK_ONLY */
+#endif /* WITH_SMCLIENT */

Modified: trunk/src/totem.c
==============================================================================
--- trunk/src/totem.c	(original)
+++ trunk/src/totem.c	Tue Oct  7 15:16:32 2008
@@ -36,10 +36,6 @@
 #include <math.h>
 #include <gio/gio.h>
 
-#ifndef HAVE_GTK_ONLY
-#include <gnome.h>
-#endif /* !HAVE_GTK_ONLY */
-
 #include <string.h>
 
 #ifdef GDK_WINDOWING_X11
@@ -3395,16 +3391,47 @@
 	g_free (url);
 }
 
+static void
+about_url_hook (GtkAboutDialog *about,
+	        const char *link,
+	        gpointer user_data)
+{
+	GError *error = NULL;
+
+	if (!gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (about)),
+	                   link,
+	                   gtk_get_current_event_time (),
+	                   &error))
+	{
+	        totem_interface_error (_("Could not open link"),
+	                               error->message,
+	                               GTK_WINDOW (about));
+	        g_error_free (error);
+	}
+}
+
+
+static void
+about_email_hook (GtkAboutDialog *about,
+		  const char *email_address,
+		  gpointer user_data)
+{
+	char *escaped, *uri;
+
+	escaped = g_uri_escape_string (email_address, NULL, FALSE);
+	uri = g_strdup_printf ("mailto:%s";, escaped);
+	g_free (escaped);
+
+	about_url_hook (about, uri, user_data);
+	g_free (uri);
+}
+
 int
 main (int argc, char **argv)
 {
 	Totem *totem;
 	GConfClient *gc;
-#ifndef HAVE_GTK_ONLY
-	GnomeProgram *program;
-#else
 	GError *error = NULL;
-#endif
 	GOptionContext *context;
 	GOptionGroup *baconoptiongroup;
 	char *sidebar_pageid;
@@ -3432,25 +3459,20 @@
 	g_option_context_set_translation_domain(context, GETTEXT_PACKAGE);
 	g_option_context_add_group (context, baconoptiongroup);
 
-#ifdef HAVE_GTK_ONLY
 	g_option_context_add_group (context, gtk_get_option_group (TRUE));
 	if (g_option_context_parse (context, &argc, &argv, &error) == FALSE) {
 		g_print (_("%s\nRun '%s --help' to see a full list of available command line options.\n"),
 				error->message, argv[0]);
 		g_error_free (error);
+	        g_option_context_free (context);
 		totem_action_exit (NULL);
 	}
-#else
-	program = gnome_program_init (PACKAGE, VERSION,
-			LIBGNOMEUI_MODULE,
-			argc, argv,
-			GNOME_PARAM_APP_DATADIR, DATADIR,
-			GNOME_PARAM_GOPTION_CONTEXT, context,
-			GNOME_PARAM_NONE);
-#endif /* HAVE_GTK_ONLY */
+	g_option_context_free (context);
 
 	g_set_application_name (_("Totem Movie Player"));
 	gtk_window_set_default_icon_name ("totem");
+	gtk_about_dialog_set_url_hook (about_url_hook, NULL, NULL);
+	gtk_about_dialog_set_email_hook (about_email_hook, NULL, NULL);
 
 	gc = gconf_client_get_default ();
 	if (gc == NULL)
@@ -3567,9 +3589,5 @@
 
 	gtk_main ();
 
-#ifndef HAVE_GTK_ONLY
-	/* Will destroy GOption allocated data automatically */
-	g_object_unref (program);
-#endif	
 	return 0;
 }

Modified: trunk/src/update-from-egg.sh
==============================================================================
--- trunk/src/update-from-egg.sh	(original)
+++ trunk/src/update-from-egg.sh	Tue Oct  7 15:16:32 2008
@@ -1,25 +1,26 @@
 #!/bin/sh
 
-function die() {
-  echo $*
-  exit 1
-}
+SVN_URI=http://svn.gnome.org/svn/libegg/trunk/libegg/smclient
+FILES="eggdesktopfile.c
+       eggdesktopfile.h
+       eggsmclient.c
+       eggsmclient.h
+       eggsmclient-osx.c
+       eggsmclient-private.h
+       eggsmclient-win32.c
+       eggsmclient-xsmp.c"
+PATCHES="eggsmclient-1.patch
+         eggsmclient-2.patch
+         eggsmclient-3.patch"
 
-if test -z "$EGGDIR"; then
-   echo "Must set EGGDIR"
-   exit 1
-fi
-
-if test -z "$EGGFILES"; then
-   echo "Must set EGGFILES"
-   exit 1
-fi
+echo "Obtaining latest version of the sources"
+for FILE in $FILES
+do
+  svn export $SVN_URI/$FILE
+done
 
-for FILE in $EGGFILES; do
-  if cmp -s $EGGDIR/$FILE $FILE; then
-     echo "File $FILE is unchanged"
-  else
-     cp $EGGDIR/$FILE $FILE || die "Could not move $EGGDIR/$FILE to $FILE"
-     echo "Updated $FILE"
-  fi
+echo "Applying patches"
+for PATCH in $PATCHES
+do
+  patch -p3 -i $PATCH
 done
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]