File gnome-bluetooth-meegoise.patch of Package gnome-bluetooth
From 5bf6dad5762bb0862a37f88ef06b0b86f8703045 Mon Sep 17 00:00:00 2001
From: Gary Ching-Pang Lin <chingpang@gmail.com>
Date: Fri, 26 Nov 2010 15:10:15 +0800
Subject: [PATCH] MeeGoise everything
Based on upstream patch:
http://git.gnome.org/browse/gnome-bluetooth/commit/?h=meego&id=3efe7f63075ac7956d8c2d8cb99d68ae63c85389
---
Makefile.am | 2 +-
configure.ac | 33 ++++++++++---------
moblin/Makefile.am | 9 ++---
moblin/bluetooth-panel.desktop.in.in | 18 +++++-----
.../com.meego.UX.Shell.Panels.bluetooth.service.in | 3 ++
moblin/main.c | 10 +++---
moblin/moblin-copy-n-paste/Makefile.am | 4 +-
moblin/moblin-panel.c | 4 +-
.../org.moblin.UX.Shell.Panels.bluetooth.service | 3 --
9 files changed, 43 insertions(+), 43 deletions(-)
create mode 100644 moblin/com.meego.UX.Shell.Panels.bluetooth.service.in
delete mode 100644 moblin/org.moblin.UX.Shell.Panels.bluetooth.service
diff --git a/Makefile.am b/Makefile.am
index f73baf4..723c5e5 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 02aaf5f..e85f9cf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -150,35 +150,35 @@ 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)
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)
@@ -209,6 +209,7 @@ AC_OUTPUT(Makefile
sendto/Makefile
moblin/Makefile
moblin/bluetooth-panel.desktop.in
+ moblin/com.meego.UX.Shell.Panels.bluetooth.service
moblin/theme/Makefile
moblin/moblin-copy-n-paste/Makefile
moblin/moblin-icons/Makefile
@@ -226,7 +227,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 e1787a7..35d0363 100644
--- a/moblin/Makefile.am
+++ b/moblin/Makefile.am
@@ -1,14 +1,14 @@
SUBDIRS = moblin-copy-n-paste theme moblin-icons
-bin_PROGRAMS = bluetooth-panel
+libexec_PROGRAMS = bluetooth-panel
bluetooth_panel_SOURCES = main.c moblin-panel.c moblin-panel.h
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) -DPKGDATADIR="\"$(pkgdatadir)\""
+AM_CFLAGS = $(MEEGO_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) -DPKGDATADIR="\"$(pkgdatadir)\""
INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/wizard -I$(top_srcdir)/moblin/moblin-copy-n-paste
@@ -27,8 +27,7 @@ paneldir = @PANEL_DIR@
panel_DATA = $(desktop_data)
servicedir = $(datadir)/dbus-1/services
-service_in_files = org.moblin.UX.Shell.Panels.bluetooth.service.in
-service_DATA = org.moblin.UX.Shell.Panels.bluetooth.service
+service_DATA = com.meego.UX.Shell.Panels.bluetooth.service
@INTLTOOL_DESKTOP_RULE@
diff --git a/moblin/bluetooth-panel.desktop.in.in b/moblin/bluetooth-panel.desktop.in.in
index 24f82b3..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=bluetooth-panel
+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/com.meego.UX.Shell.Panels.bluetooth.service.in b/moblin/com.meego.UX.Shell.Panels.bluetooth.service.in
new file mode 100644
index 0000000..86a7294
--- /dev/null
+++ b/moblin/com.meego.UX.Shell.Panels.bluetooth.service.in
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=com.meego.UX.Shell.Panels.bluetooth
+Exec=@LIBEXECDIR@/bluetooth-panel
diff --git a/moblin/main.c b/moblin/main.c
index 0531c3b..ce6a525 100644
--- a/moblin/main.c
+++ b/moblin/main.c
@@ -29,9 +29,9 @@
#include <gtk/gtk.h>
#include <gdk/gdkx.h>
#include <glib/gi18n.h>
-#include <mx/mx-gtk.h>
-#include <moblin-panel/mpl-panel-common.h>
-#include <moblin-panel/mpl-panel-gtk.h>
+#include <mx-gtk/mx-gtk.h>
+#include <meego-panel/mpl-panel-common.h>
+#include <meego-panel/mpl-panel-gtk.h>
#include <bluetooth-enums.h>
#include "moblin-panel.h"
@@ -91,8 +91,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 3c9d2f1..071ce32 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 45b2ce2..2c1ace0 100644
--- a/moblin/moblin-panel.c
+++ b/moblin/moblin-panel.c
@@ -32,7 +32,7 @@
#include <glib/gi18n.h>
#include <math.h>
#include <gdk/gdkkeysyms.h>
-#include <mx/mx-gtk.h>
+#include <mx-gtk/mx-gtk.h>
#include "bluetooth-client.h"
#include "bluetooth-client-private.h"
@@ -1451,7 +1451,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);
diff --git a/moblin/org.moblin.UX.Shell.Panels.bluetooth.service b/moblin/org.moblin.UX.Shell.Panels.bluetooth.service
deleted file mode 100644
index 86e7cc0..0000000
--- a/moblin/org.moblin.UX.Shell.Panels.bluetooth.service
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.moblin.UX.Shell.Panels.bluetooth
-Exec=/usr/bin/bluetooth-panel
--
1.6.0.2
