fixed some conflicts with gnome-bluetooth

mate-bluetooth/applet/Makefile.am

@@ -1,5 +1,5 @@
 
-bin_PROGRAMS = bluetooth-applet
+bin_PROGRAMS = mate-bluetooth-applet
 
 bluetooth_applet_SOURCES = main.c notify.h notify.c agent.h agent.c
 
@@ -17,15 +17,15 @@ AM_CFLAGS = $(APPLET_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) -DPKGDATADIR="
 
 INCLUDES = -I$(top_srcdir)/lib
 
-man_MANS = bluetooth-applet.1
+man_MANS = mate-bluetooth-applet.1
 
 ui_DATA = popup-menu.ui authorisation-dialogue.ui confirm-dialogue.ui passkey-dialogue.ui
 uidir = $(pkgdatadir)
 
 autostartdir = $(sysconfdir)/xdg/autostart
 
-autostart_in_in_files = bluetooth-applet.desktop.in.in
-autostart_in_files = bluetooth-applet.desktop.in
+autostart_in_in_files = mate-bluetooth-applet.desktop.in.in
+autostart_in_files = mate-bluetooth-applet.desktop.in
 
 autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
 

mate-bluetooth/applet/bluetooth-applet.1 → mate-bluetooth/applet/mate-bluetooth-applet.1

@@ -1,21 +1,21 @@
 .TH BLUETOOTH-APPLET 1 "Oct 4, 2006" "bluez-mate" "Linux User's Manual"
 .SH NAME
-bluetooth-applet - MATE applet for prompting the user for a Bluetooth passkey (PIN)
+mate-bluetooth-applet - MATE applet for prompting the user for a Bluetooth passkey (PIN)
 .SH SYNOPSIS
-.B bluetooth-applet
+.B mate-bluetooth-applet
 .SH DESCRIPTION
-.I bluetooth-applet
+.I mate-bluetooth-applet
 will stay in your MATE panel as a Bluetooth icon and will pop up a dialog
 whenever a passkey (aka PIN) is required from the Linux Bluetooth stack.
-.I bluetooth-applet
+.I mate-bluetooth-applet
 is part of bluez-mate, see also http://www.bluez.org
 .SH OPTIONS
-.I bluetooth-applet
+.I mate-bluetooth-applet
 takes no options
 .SH AUTHOR
 Marcel Holtmann <marcel@holtmann.org>
 .SH LICENSE
-bluetooth-applet is free software; you can redistribute it and/or modify it
+mate-bluetooth-applet is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the Free
 Software Foundation; either version 2 of the License, or (at your option)
 any later version.

mate-bluetooth/applet/bluetooth-applet.desktop.in.in → mate-bluetooth/applet/mate-bluetooth-applet.desktop.in.in

@@ -1,8 +1,8 @@
 [Desktop Entry]
 _Name=Bluetooth Manager
-_Comment=Bluetooth Manager applet
+_Comment=MATE Bluetooth Manager applet
 Icon=bluetooth
-Exec=bluetooth-applet
+Exec=mate-bluetooth-applet
 Terminal=false
 Type=Application
 Categories=

mate-bluetooth/configure.ac

@@ -202,9 +202,9 @@ AC_OUTPUT(Makefile
 	  lib/Makefile
 	  lib/plugins/Makefile
 	  applet/Makefile
-	  applet/bluetooth-applet.desktop.in
+	  applet/mate-bluetooth-applet.desktop.in
 	  properties/Makefile
-	  properties/bluetooth-properties.desktop.in
+	  properties/mate-bluetooth-properties.desktop.in
 	  wizard/Makefile
 	  sendto/Makefile
 	  moblin/Makefile

mate-bluetooth/icons/Makefile.am

@@ -1,38 +1,38 @@
 
-icons = hicolor_apps_16x16_bluetooth.png \
-	hicolor_apps_22x22_bluetooth.png \
-	hicolor_apps_24x24_bluetooth.png \
-	hicolor_apps_32x32_bluetooth.png \
-	hicolor_apps_48x48_bluetooth.png \
-	hicolor_apps_scalable_bluetooth.svg \
-	hicolor_status_16x16_bluetooth-active.png \
-	hicolor_status_22x22_bluetooth-active.png \
-	hicolor_status_24x24_bluetooth-active.png \
-	hicolor_status_32x32_bluetooth-active.png \
-	hicolor_status_48x48_bluetooth-active.png \
-	hicolor_status_16x16_bluetooth-disabled.png \
-	hicolor_status_22x22_bluetooth-disabled.png \
-	hicolor_status_24x24_bluetooth-disabled.png \
-	hicolor_status_32x32_bluetooth-disabled.png \
-	hicolor_status_48x48_bluetooth-disabled.png \
-	hicolor_status_16x16_bluetooth-paired.png \
-	hicolor_status_22x22_bluetooth-paired.png \
-	hicolor_status_24x24_bluetooth-paired.png \
-	hicolor_status_32x32_bluetooth-paired.png \
-	hicolor_status_scalable_bluetooth-paired.svg
+icons = mate_apps_16x16_bluetooth.png \
+	mate_apps_22x22_bluetooth.png \
+	mate_apps_24x24_bluetooth.png \
+	mate_apps_32x32_bluetooth.png \
+	mate_apps_48x48_bluetooth.png \
+	mate_apps_scalable_bluetooth.svg \
+	mate_status_16x16_bluetooth-active.png \
+	mate_status_22x22_bluetooth-active.png \
+	mate_status_24x24_bluetooth-active.png \
+	mate_status_32x32_bluetooth-active.png \
+	mate_status_48x48_bluetooth-active.png \
+	mate_status_16x16_bluetooth-disabled.png \
+	mate_status_22x22_bluetooth-disabled.png \
+	mate_status_24x24_bluetooth-disabled.png \
+	mate_status_32x32_bluetooth-disabled.png \
+	mate_status_48x48_bluetooth-disabled.png \
+	mate_status_16x16_bluetooth-paired.png \
+	mate_status_22x22_bluetooth-paired.png \
+	mate_status_24x24_bluetooth-paired.png \
+	mate_status_32x32_bluetooth-paired.png \
+	mate_status_scalable_bluetooth-paired.svg
 
 
-noinst_DATA = hicolor_apps_16x16_bluetooth.svg \
-		hicolor_apps_22x22_bluetooth.svg \
-		hicolor_apps_32x32_bluetooth.svg \
-		hicolor_status_16x16_bluetooth-active.svg \
-		hicolor_status_22x22_bluetooth-active.svg \
-		hicolor_status_32x32_bluetooth-active.svg \
-		hicolor_status_48x48_bluetooth-active.svg \
-		hicolor_status_16x16_bluetooth-disabled.svg \
-		hicolor_status_22x22_bluetooth-disabled.svg \
-		hicolor_status_32x32_bluetooth-disabled.svg \
-		hicolor_status_48x48_bluetooth-disabled.svg
+noinst_DATA = mate_apps_16x16_bluetooth.svg \
+		mate_apps_22x22_bluetooth.svg \
+		mate_apps_32x32_bluetooth.svg \
+		mate_status_16x16_bluetooth-active.svg \
+		mate_status_22x22_bluetooth-active.svg \
+		mate_status_32x32_bluetooth-active.svg \
+		mate_status_48x48_bluetooth-active.svg \
+		mate_status_16x16_bluetooth-disabled.svg \
+		mate_status_22x22_bluetooth-disabled.svg \
+		mate_status_32x32_bluetooth-disabled.svg \
+		mate_status_48x48_bluetooth-disabled.svg
 
 EXTRA_DIST = $(icons) $(noinst_DATA)
 
@@ -59,11 +59,11 @@ uninstall-local:
 
 install-data-hook:
 if ICON_UPDATE
-	$(UPDATE_ICON_CACHE) -f -t $(DESTDIR)$(datadir)/icons/hicolor
+	$(UPDATE_ICON_CACHE) -f -t $(DESTDIR)$(datadir)/icons/mate
 endif
 
 uninstall-hook:
 if ICON_UPDATE
-	$(UPDATE_ICON_CACHE) $(DESTDIR)$(datadir)/icons/hicolor
+	$(UPDATE_ICON_CACHE) $(DESTDIR)$(datadir)/icons/mate
 endif
 

mate-bluetooth/properties/Makefile.am

@@ -1,5 +1,5 @@
 
-bin_PROGRAMS = bluetooth-properties
+bin_PROGRAMS = mate-bluetooth-properties
 
 bluetooth_properties_SOURCES = main.c general.h general.c adapter.h adapter.c
 
@@ -9,11 +9,11 @@ AM_CFLAGS = $(PROPS_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) -DPKGDATADIR="\
 
 INCLUDES = -I$(top_srcdir)/lib
 
-man_MANS = bluetooth-properties.1
+man_MANS = mate-bluetooth-properties.1
 
 desktopdir = $(datadir)/applications
-desktop_in_in_files = bluetooth-properties.desktop.in.in
-desktop_in_files = bluetooth-properties.desktop.in
+desktop_in_in_files = mate-bluetooth-properties.desktop.in.in
+desktop_in_files = mate-bluetooth-properties.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 

mate-bluetooth/properties/bluetooth-properties.1 → mate-bluetooth/properties/mate-bluetooth-properties.1

@@ -1,20 +1,20 @@
-.TH BLUETOOTH-PROPERTIES 1 "Oct 4, 2006" "bluez-mate" "Linux User's Manual"
+.TH mate-bluetooth-properties 1 "Oct 4, 2006" "bluez-mate" "Linux User's Manual"
 .SH NAME
-bluetooth-properties - GTK dialog for managing properties of the Linux Bluetooth stack
+mate-bluetooth-properties - GTK dialog for managing properties of the Linux Bluetooth stack
 .SH SYNOPSIS
-.B bluetooth-properties
+.B mate-bluetooth-properties
 .SH DESCRIPTION
-.I bluetooth-properties
+.I mate-bluetooth-properties
 will display a dialog for changing Bluetooth preferences.
-.I bluetooth-properties
+.I mate-bluetooth-properties
 is part of bluez-mate, see also http://www.bluez.org
 .SH OPTIONS
-.I bluetooth-properties
+.I mate-bluetooth-properties
 takes no options
 .SH AUTHOR
 Marcel Holtmann <marcel@holtmann.org>
 .SH LICENSE
-bluetooth-properties is free software; you can redistribute it and/or modify it
+mate-bluetooth-properties is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the Free
 Software Foundation; either version 2 of the License, or (at your option)
 any later version.

mate-bluetooth/properties/bluetooth-properties.desktop.in.in → mate-bluetooth/properties/mate-bluetooth-properties.desktop.in.in

@@ -1,8 +1,8 @@
 [Desktop Entry]
 _Name=Bluetooth
-_Comment=Configure Bluetooth settings
+_Comment=Configure MATE Bluetooth settings
 Icon=bluetooth
-Exec=bluetooth-properties
+Exec=mate-bluetooth-properties
 Terminal=false
 Type=Application
 Categories=GTK;MATE;Settings;X-MATE-NetworkSettings;

mate-bluetooth/sendto/Makefile.am

@@ -11,13 +11,13 @@ AM_CFLAGS =                                     \
 	$(DISABLE_DEPRECATED)			\
 	$(WARN_CFLAGS)
 
-bin_PROGRAMS = bluetooth-sendto
+bin_PROGRAMS = mate-bluetooth-sendto
 
 bluetooth_sendto_SOURCES = main.c
 
 bluetooth_sendto_LDADD = $(top_builddir)/lib/libcommon.la $(top_builddir)/lib/libmate-bluetooth.la $(SENDTO_LIBS)
 
-man_MANS = bluetooth-sendto.1
+man_MANS = mate-bluetooth-sendto.1
 
 if HAVE_NST
 plugindir = $(libdir)/caja-sendto/plugins

mate-bluetooth/sendto/bluetooth-sendto.1 → mate-bluetooth/sendto/mate-bluetooth-sendto.1

@@ -1,13 +1,13 @@
-.TH BLUETOOTH-SENDTO 1 "Oct 4, 2006" "mate-bluetooth" "Linux User's Manual"
+.TH mate-bluetooth-sendto 1 "Oct 4, 2006" "mate-bluetooth" "Linux User's Manual"
 .SH NAME
-bluetooth-sendto - GTK application for transfering files over Bluetooth
+mate-bluetooth-sendto - GTK application for transfering files over Bluetooth
 .SH SYNOPSIS
-.B bluetooth-sendto
+.B mate-bluetooth-sendto
 [\--device=XX:XX:XX:XX:XX:XX] [file] [file...]
 .SH DESCRIPTION
-.I bluetooth-sendto
+.I mate-bluetooth-sendto
 will display a dialog for transfering files over Bluetooth.
-.I bluetooth-sendto
+.I mate-bluetooth-sendto
 is part of mate-bluetooth, see also http://live.mate.org/MateBluetooth
 .SH OPTIONS
 .TP
@@ -19,7 +19,7 @@ The file(s) to send to the device
 .SH AUTHOR
 Marcel Holtmann <marcel@holtmann.org>
 .SH LICENSE
-bluetooth-sendto is free software; you can redistribute it and/or modify it
+mate-bluetooth-sendto is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the Free
 Software Foundation; either version 2 of the License, or (at your option)
 any later version.

mate-bluetooth/wizard/Makefile.am

@@ -7,7 +7,7 @@ libwizard_la_LDFLAGS = -no-undefined $(AM_LDFLAGS)
 
 noinst_PROGRAMS = test-input
 
-bin_PROGRAMS = bluetooth-wizard
+bin_PROGRAMS = mate-bluetooth-wizard
 
 bluetooth_wizard_SOURCES = main.c
 
@@ -26,7 +26,7 @@ uidir = $(pkgdatadir)
 
 INCLUDES = -I$(top_srcdir)/lib
 
-man_MANS = bluetooth-wizard.1
+man_MANS = mate-bluetooth-wizard.1
 
 all: check