brasero r1692 - in trunk: . po src
- From: philippr svn gnome org
- To: svn-commits-list gnome org
- Subject: brasero r1692 - in trunk: . po src
- Date: Mon, 5 Jan 2009 20:54:57 +0000 (UTC)
Author: philippr
Date: Mon Jan 5 20:54:56 2009
New Revision: 1692
URL: http://svn.gnome.org/viewvc/brasero?rev=1692&view=rev
Log:
2009-01-05 Philippe Rouquier <ykw localhost localdomain>
Remove GNOMEUI dependency
* Makefile.am:
* configure.in:
* src/main.c (main):
Modified:
trunk/ChangeLog
trunk/Makefile.am
trunk/configure.in
trunk/po/POTFILES.in
trunk/src/main.c
Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am (original)
+++ trunk/Makefile.am Mon Jan 5 20:54:56 2009
@@ -1,9 +1,7 @@
## Process this file with automake to produce Makefile.in.
SUBDIRS = src po data docs
-if BUILD_GNOME2
SUBDIRS += help
-endif
if BUILD_NAUTILUS
SUBDIRS += nautilus
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Mon Jan 5 20:54:56 2009
@@ -164,11 +164,12 @@
dnl ** used only by brasero app itself ***
PKG_CHECK_MODULES(BRASERO_UI, \
- hal >= $HAL_REQUIRED \
+ hal >= $HAL_REQUIRED \
gmodule-2.0 >= $GMODULE_REQUIRED \
- gdk-2.0 >= $GDK_REQUIRED \
+ gdk-2.0 >= $GDK_REQUIRED \
gtk+-2.0 >= $GTK_REQUIRED \
- dbus-glib-1 >= $DBUS_REQUIRED)
+ dbus-glib-1 >= $DBUS_REQUIRED \
+ sm)
AC_SUBST(BRASERO_UI_CFLAGS)
AC_SUBST(BRASERO_UI_LIBS)
@@ -179,29 +180,6 @@
AC_SUBST(BRASERO_CFLAGS)
AC_SUBST(BRASERO_LIBS)
-dnl ********** GNOME2 ******************************
-LIBGNOME_REQUIRED=2.10.0
-LIBGNOMEUI_REQUIRED=2.10.0
-
-AC_ARG_ENABLE(gnome2,
- [ --enable-gnome2 Build with GNOME2 (improved integration with GNOME2, session management support) [[default = yes]]],,
- [enable_gnome2="yes"])
-
-if test x"$enable_gnome2" = "xyes"; then
- PKG_CHECK_MODULES(GNOME2, libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED, build_gnome2=yes, build_gnome2=no)
-else
- build_gnome2="no"
-fi
-
-if test x"$build_gnome2" = "xyes"; then
- BRASERO_CFLAGS="$BRASERO_CFLAGS $GNOME2_CFLAGS"
- BRASERO_LIBS="$BRASERO_LIBS $GNOME2_LIBS"
-
- AC_DEFINE(BUILD_GNOME2, 1, [define if you want to build with tight GNOME2 integration])
-fi
-
-AM_CONDITIONAL(BUILD_GNOME2, test x"$build_gnome2" = "xyes")
-
dnl ****************Nautilus**********************************
NAUTILUS_REQUIRED=2.22.2
@@ -440,7 +418,6 @@
echo "Version: $BRASERO_VERSION
Update caches: ${enable_caches}
- Build with GNOME2 : ${build_gnome2}
Build Nautilus extension : ${build_nautilus}
Build inotify: ${enable_inotify}
Build search pane : ${build_beagle}
Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in (original)
+++ trunk/po/POTFILES.in Mon Jan 5 20:54:56 2009
@@ -1,6 +1,8 @@
# List of source files containing translatable strings.
[encoding: UTF-8]
+rc/eggdesktopfile.c
+src/eggsmclient.c
src/brasero-tool-color-picker.c
src/brasero-video-project.c
src/brasero-pref.c
Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c (original)
+++ trunk/src/main.c Mon Jan 5 20:54:56 2009
@@ -43,12 +43,6 @@
#include <gst/gst.h>
#include <gst/pbutils/pbutils.h>
-#ifdef BUILD_GNOME2
-
-#include <libgnomeui/libgnomeui.h>
-
-#endif
-
#include "brasero-project-manager.h"
#include "brasero-multi-dnd.h"
#include "brasero-session.h"
@@ -462,11 +456,6 @@
main (int argc, char **argv)
{
GConfClient *client;
-
-#ifdef BUILD_GNOME2
- GnomeProgram *program;
-#endif
-
GOptionContext *context;
@@ -485,17 +474,6 @@
GETTEXT_PACKAGE);
g_option_context_set_translation_domain (context, GETTEXT_PACKAGE);
-#ifdef BUILD_GNOME2
-
- program = gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE,
- argc, argv,
- GNOME_PARAM_GOPTION_CONTEXT, context,
- GNOME_PARAM_APP_DATADIR, PACKAGE_DATA_DIR,
- GNOME_PARAM_HUMAN_READABLE_NAME, _("CD/DVD burning"),
- NULL);
-
-#else
-
g_option_context_add_group (context, egg_sm_client_get_option_group ());
g_option_context_add_group (context, gtk_get_option_group (TRUE));
g_option_context_add_group (context, gst_init_get_option_group ());
@@ -507,8 +485,6 @@
g_option_context_free (context);
-#endif
-
gst_init (&argc, &argv);
/* This is for missing codec automatic install */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]