[gnome-bluetooth/meego] MeeGoise everything

[Ross Burton <rburton src gnome org>]

commit 3efe7f63075ac7956d8c2d8cb99d68ae63c85389
Author: Ross Burton <ross linux intel com>
Date:   Tue Jun 22 11:57:03 2010 +0100

    MeeGoise everything

 INSTALL                                            |  200 ++++++++++++++++----
 Makefile.am                                        |    2 +-
 configure.ac                                       |   34 ++--
 moblin/Makefile.am                                 |    6 +-
 moblin/bluetooth-panel.desktop.in.in               |   16 +-
 ...com.meego.UX.Shell.Panels.bluetooth.service.in} |    2 +-
 moblin/main.c                                      |    8 +-
 moblin/moblin-copy-n-paste/Makefile.am             |    4 +-
 moblin/moblin-panel.c                              |    2 +-
 9 files changed, 201 insertions(+), 73 deletions(-)
---
diff --git a/INSTALL b/INSTALL
index d3c5b40..7d1c323 100644
--- a/INSTALL
+++ b/INSTALL
@@ -2,18 +2,24 @@ Installation Instructions
 *************************
 
 Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007 Free Software Foundation, Inc.
+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 
-This file is free documentation; the Free Software Foundation gives
-unlimited permission to copy, distribute and modify it.
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
 
 Basic Installation
 ==================
 
-Briefly, the shell commands `./configure; make; make install' should
+   Briefly, the shell commands `./configure; make; make install' should
 configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -42,7 +48,7 @@ may remove or edit it.
 you want to change it or regenerate `configure' using a newer version
 of `autoconf'.
 
-The simplest way to compile this package is:
+   The simplest way to compile this package is:
 
   1. `cd' to the directory containing the package's source code and type
      `./configure' to configure the package for your system.
@@ -53,12 +59,22 @@ The simplest way to compile this package is:
   2. Type `make' to compile the package.
 
   3. Optionally, type `make check' to run any self-tests that come with
-     the package.
+     the package, generally using the just-built uninstalled binaries.
 
   4. Type `make install' to install the programs and any data files and
-     documentation.
-
-  5. You can remove the program binaries and object files from the
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
+
+  6. You can remove the program binaries and object files from the
      source code directory by typing `make clean'.  To also remove the
      files that `configure' created (so you can compile the package for
      a different kind of computer), type `make distclean'.  There is
@@ -67,15 +83,22 @@ The simplest way to compile this package is:
      all sorts of other programs in order to regenerate files that came
      with the distribution.
 
-  6. Often, you can also type `make uninstall' to remove the installed
-     files again.
+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
 
 Compilers and Options
 =====================
 
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
 
    You can give `configure' initial values for configuration parameters
 by setting variables in the command line or in the environment.  Here
@@ -88,25 +111,41 @@ is an example:
 Compiling For Multiple Architectures
 ====================================
 
-You can compile the package for more than one kind of computer at the
+   You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
 own directory.  To do this, you can use GNU `make'.  `cd' to the
 directory where you want the object files and executables to go and run
 the `configure' script.  `configure' automatically checks for the
-source code in the directory that `configure' is in and in `..'.
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
 
    With a non-GNU `make', it is safer to compile the package for one
 architecture at a time in the source code directory.  After you have
 installed the package for one architecture, use `make distclean' before
 reconfiguring for another architecture.
 
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
 Installation Names
 ==================
 
-By default, `make install' installs the package's commands under
+   By default, `make install' installs the package's commands under
 `/usr/local/bin', include files under `/usr/local/include', etc.  You
 can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
@@ -117,16 +156,47 @@ Documentation and other data files still use the regular prefix.
    In addition, if you use an unusual directory layout you can give
 options like `--bindir=DIR' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
-you can set and what kinds of files go in them.
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
 
    If the package supports it, you can cause programs to be installed
 with an extra prefix or suffix on their names by giving `configure' the
 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
 
-Optional Features
-=================
-
-Some packages pay attention to `--enable-FEATURE' options to
+   Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
 is something like `gnu-as' or `x' (for the X Window System).  The
@@ -138,14 +208,53 @@ find the X include and library files automatically, but if it doesn't,
 you can use the `configure' options `--x-includes=DIR' and
 `--x-libraries=DIR' to specify their locations.
 
+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
+Particular systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
+a workaround.  If GNU CC is not installed, it is therefore recommended
+to try
+
+     ./configure CC="cc"
+
+and if that doesn't work, try
+
+     ./configure CC="cc -nodtk"
+
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
 Specifying the System Type
 ==========================
 
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
 `--build=TYPE' option.  TYPE can either be a short name for the system
 type, such as `sun4', or a canonical name which has the form:
 
@@ -153,7 +262,8 @@ type, such as `sun4', or a canonical name which has the form:
 
 where SYSTEM can have one of these forms:
 
-     OS KERNEL-OS
+     OS
+     KERNEL-OS
 
    See the file `config.sub' for the possible values of each field.  If
 `config.sub' isn't included in this package, then this package doesn't
@@ -171,9 +281,9 @@ eventually be run) with `--host=TYPE'.
 Sharing Defaults
 ================
 
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
 `configure' looks for `PREFIX/share/config.site' if it exists, then
 `PREFIX/etc/config.site' if it exists.  Or, you can set the
 `CONFIG_SITE' environment variable to the location of the site script.
@@ -182,7 +292,7 @@ A warning: not all `configure' scripts look for a site script.
 Defining Variables
 ==================
 
-Variables not defined in a site shell script can be set in the
+   Variables not defined in a site shell script can be set in the
 environment passed to `configure'.  However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost.  In order to avoid this problem, you should set
@@ -201,11 +311,19 @@ an Autoconf bug.  Until the bug is fixed you can use this workaround:
 `configure' Invocation
 ======================
 
-`configure' recognizes the following options to control how it operates.
+   `configure' recognizes the following options to control how it
+operates.
 
 `--help'
 `-h'
-     Print a summary of the options to `configure', and exit.
+     Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+     Print a summary of the options unique to this package's
+     `configure', and exit.  The `short' variant lists options used
+     only in the top level, while the `recursive' variant lists options
+     also present in any nested packages.
 
 `--version'
 `-V'
@@ -232,6 +350,16 @@ an Autoconf bug.  Until the bug is fixed you can use this workaround:
      Look for the package's source code in directory DIR.  Usually
      `configure' can determine that directory automatically.
 
+`--prefix=DIR'
+     Use DIR as the installation prefix.  *note Installation Names::
+     for more details, including other options available for fine-tuning
+     the installation locations.
+
+`--no-create'
+`-n'
+     Run the configure checks, but stop before creating any output
+     files.
+
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
 
diff --git a/Makefile.am b/Makefile.am
index 9391392..7ae2b1d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 DEF_SUBDIRS = icons lib applet properties wizard sendto docs po help
 
-if WITH_MOBLIN
+if WITH_MEEGO
 MOBLIN_DIR = moblin
 endif
 
diff --git a/configure.ac b/configure.ac
index f28792b..a59b1f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -151,37 +151,37 @@ dnl Requires for the plugins
 PKG_CHECK_MODULES(PLUGINS,
 		  gtk+-2.0)
 
-dnl Requires for the moblin interface
-AC_ARG_ENABLE(moblin,
-              AS_HELP_STRING([--enable-moblin=@<:@no/yes/auto@:>@],
-                             [build moblin interface]), ,
-                             enable_moblin=auto)
-
-if test "x$enable_moblin" != "xno"; then
-   PKG_CHECK_MODULES(MOBLIN,
+dnl Requires for the MeeGo interface
+AC_ARG_ENABLE(meego,
+              AS_HELP_STRING([--enable-meego=@<:@no/yes/auto@:>@],
+                             [build MeeGo interface]), ,
+                             enable_meego=auto)
+
+if test "x$enable_meego" != "xno"; then
+   PKG_CHECK_MODULES(MEEGO,
    [
       dbus-glib-1,
       gtk+-2.0,
       mx-gtk-1.0
-      moblin-panel
-   ], have_moblin="yes", have_moblin="no")
+      meego-panel
+   ], have_meego="yes", have_meego="no")
 
    THEME_DIR="${datadir}/${PACKAGE}/theme"
    AS_AC_EXPAND(THEME_DIR, $THEME_DIR)
    AC_DEFINE_UNQUOTED([THEME_DIR], "$THEME_DIR", [Carrick theme directory])
 
-   PANEL_DIR=$($PKG_CONFIG moblin-panel --variable=moblin_panel_panels_dir)
+   PANEL_DIR=$($PKG_CONFIG meego-panel --variable=meego_panel_panels_dir)
    AC_SUBST(PANEL_DIR)
 
    AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
 else
-   have_moblin=no
+   have_meego=no
 fi
 
-if test "x$enable_moblin" = "xyes" -a "x$have_moblin" != "xyes"; then
-   AC_MSG_ERROR([Couldn't find Moblin dependencies.])
+if test "x$enable_meego" = "xyes" -a "x$have_meego" != "xyes"; then
+   AC_MSG_ERROR([Couldn't find MeeGo dependencies.])
 fi
-AM_CONDITIONAL(WITH_MOBLIN, test "x$have_moblin" = "xyes")
+AM_CONDITIONAL(WITH_MEEGO, test "x$have_meego" = "xyes")
 
 DBUS_BINDING_TOOL="dbus-binding-tool"
 AC_SUBST(DBUS_BINDING_TOOL)
@@ -212,7 +212,7 @@ AC_OUTPUT(Makefile
 	  sendto/Makefile
 	  moblin/Makefile
 	  moblin/bluetooth-panel.desktop.in
-          moblin/org.moblin.UX.Shell.Panels.bluetooth.service
+          moblin/com.meego.UX.Shell.Panels.bluetooth.service
 	  moblin/theme/Makefile
 	  moblin/moblin-copy-n-paste/Makefile
 	  moblin/moblin-icons/Makefile
@@ -230,7 +230,7 @@ Configure summary:
 	Compiler....................:  ${CC}
 	Compiler Flags..............:  ${CFLAGS}
 	Prefix......................:  ${prefix}
-	Moblin interface............:  ${have_moblin}
+	MeeGo interface.............:  ${have_meego}
 	nautilus-sendto plugin......:  ${have_nst}
 	Documentation...............:  ${enable_gtk_doc}
 	GObject-Introspection.......:  ${found_introspection}
diff --git a/moblin/Makefile.am b/moblin/Makefile.am
index 9ce344a..7785798 100644
--- a/moblin/Makefile.am
+++ b/moblin/Makefile.am
@@ -8,9 +8,9 @@ bluetooth_panel_SOURCES = main.c \
 
 bluetooth_panel_LDADD = $(top_builddir)/lib/libcommon.la $(top_builddir)/lib/libgnome-bluetooth.la \
 			$(top_builddir)/moblin/moblin-copy-n-paste/libmoblin.la \
-			$(top_builddir)/wizard/libwizard.la $(MOBLIN_LIBS)
+			$(top_builddir)/wizard/libwizard.la $(MEEGO_LIBS)
 
-AM_CFLAGS = $(MOBLIN_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) \
+AM_CFLAGS = $(MEEGO_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) \
 	-DPKGDATADIR="\"$(pkgdatadir)\"" -DLIBEXECDIR="\"$(LIBEXECDIR)\""
 
 INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/wizard -I$(top_srcdir)/moblin/moblin-copy-n-paste
@@ -30,7 +30,7 @@ paneldir = @PANEL_DIR@
 panel_DATA = $(desktop_data)
 
 servicedir = $(datadir)/dbus-1/services
-service_DATA = org.moblin.UX.Shell.Panels.bluetooth.service
+service_DATA = com.meego.UX.Shell.Panels.bluetooth.service
 
 CLEANFILES = $(desktop_DATA)
 
diff --git a/moblin/bluetooth-panel.desktop.in.in b/moblin/bluetooth-panel.desktop.in.in
index ad935a7..1174e90 100644
--- a/moblin/bluetooth-panel.desktop.in.in
+++ b/moblin/bluetooth-panel.desktop.in.in
@@ -1,16 +1,16 @@
 [Desktop Entry]
 Version=1.0
-_Name=Moblin Bluetooth Panel
+_Name=Bluetooth Panel
 _Comment=Bluetooth Manager Panel
 Icon=bluetooth
 Exec= LIBEXECDIR@/bluetooth-panel
 Terminal=false
 Type=Application
-OnlyShowIn=MOBLIN;
+OnlyShowIn=MEEGO-NB;
 X-GNOME-Autostart-enable=true
-X-Moblin-Priority=Low
-X-Moblin-Service=org.moblin.UX.Shell.Panels.bluetooth
-X-Moblin-Panel-Optional=true
-X-Moblin-Panel-Type=applet
-X-Moblin-Panel-Stylesheet= THEME_DIR@/bluetooth-panel.css
-X-Moblin-Panel-Button-Style=state-idle
+X-Meego-Priority=Low
+X-Meego-Service=com.meego.UX.Shell.Panels.bluetooth
+X-Meego-Panel-Optional=true
+X-Meego-Panel-Type=applet
+X-Meego-Panel-Stylesheet= THEME_DIR@/bluetooth-panel.css
+X-Meego-Panel-Button-Style=state-idle
diff --git a/moblin/org.moblin.UX.Shell.Panels.bluetooth.service.in b/moblin/com.meego.UX.Shell.Panels.bluetooth.service.in
similarity index 54%
rename from moblin/org.moblin.UX.Shell.Panels.bluetooth.service.in
rename to moblin/com.meego.UX.Shell.Panels.bluetooth.service.in
index c0f0479..86a7294 100644
--- a/moblin/org.moblin.UX.Shell.Panels.bluetooth.service.in
+++ b/moblin/com.meego.UX.Shell.Panels.bluetooth.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.moblin.UX.Shell.Panels.bluetooth
+Name=com.meego.UX.Shell.Panels.bluetooth
 Exec= LIBEXECDIR@/bluetooth-panel
diff --git a/moblin/main.c b/moblin/main.c
index d1786ca..686fdbd 100644
--- a/moblin/main.c
+++ b/moblin/main.c
@@ -29,8 +29,8 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #include <glib/gi18n.h>
-#include <moblin-panel/mpl-panel-common.h>
-#include <moblin-panel/mpl-panel-gtk.h>
+#include <meego-panel/mpl-panel-common.h>
+#include <meego-panel/mpl-panel-gtk.h>
 #include <bluetooth-enums.h>
 
 #include "moblin-panel.h"
@@ -97,8 +97,8 @@ main (int argc, char *argv[])
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 	textdomain (GETTEXT_PACKAGE);
 
-	g_set_application_name (_("Moblin Bluetooth Panel"));
-	gtk_init_with_args (&argc, &argv, _("- Moblin Bluetooth Panel"),
+	g_set_application_name (_("MeeGo Bluetooth Panel"));
+	gtk_init_with_args (&argc, &argv, _("- MeeGo Bluetooth Panel"),
 				entries, GETTEXT_PACKAGE, &error);
 
 	if (error) {
diff --git a/moblin/moblin-copy-n-paste/Makefile.am b/moblin/moblin-copy-n-paste/Makefile.am
index d751af8..71de444 100644
--- a/moblin/moblin-copy-n-paste/Makefile.am
+++ b/moblin/moblin-copy-n-paste/Makefile.am
@@ -1,7 +1,7 @@
 noinst_LTLIBRARIES = libmoblin.la
-libmoblin_la_CFLAGS = $(MOBLIN_CFLAGS) \
+libmoblin_la_CFLAGS = $(MEEGO_CFLAGS) \
 	              -DPKG_DATADIR=\"$(pkgdatadir)\" -Wall
-libmoblin_la_LIBADD = $(MOBLIN_LIBS)
+libmoblin_la_LIBADD = $(MEEGO_LIBS)
 libmoblin_la_SOURCES = koto-cell-renderer-pixbuf.c \
 		       koto-cell-renderer-pixbuf.h \
 		       mux-cell-renderer-text.c \
diff --git a/moblin/moblin-panel.c b/moblin/moblin-panel.c
index fad26a8..e241fa5 100644
--- a/moblin/moblin-panel.c
+++ b/moblin/moblin-panel.c
@@ -1632,7 +1632,7 @@ create_devices_page (MoblinPanel *self)
 	/* Power switch */
 	/* Translators: This string appears next to a toggle switch which controls
 	 * enabling/disabling Bluetooth radio's on the device. Akin to the power
-	 * switches in the Network UI of Moblin */
+	 * switches in the Network UI of MeeGo */
 	power_label = gtk_label_new (_("Bluetooth"));
 	gtk_widget_show (power_label);
 	gtk_box_pack_start (GTK_BOX (hbox), power_label, FALSE, FALSE, 4);