Rename symbols potentially conflicting with libmcclient: change the prefix

from `mc_' to `omc_'.



git-svn-id: https://mission-control.svn.sourceforge.net/svnroot/mission-control/trunk@445 d91c8aed-3f2b-0410-a83d-924a1c20a0ba

9 files changed, 175 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 5cf841bc..a8c02481 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-23  Alberto Mardegan  <alberto.mardegan@nokia.com>
+
+	* libmissioncontrol/Makefile.am, libmissioncontrol/*.h:
+	Rename symbols potentially conflicting with libmcclient: change the prefix
+	from `mc_' to `omc_'.
+
 2008-06-18  Alberto Mardegan  <alberto.mardegan@nokia.com>
 
 	* tools/glib-client-gen.py:
diff --git a/libmissioncontrol/Makefile.am b/libmissioncontrol/Makefile.am
index b457f010..9554d27b 100644
--- a/libmissioncontrol/Makefile.am
+++ b/libmissioncontrol/Makefile.am
@@ -57,6 +57,7 @@ libmissioncontrol_client_include_HEADERS = \
         mc-profile.h \
         mc-protocol.h \
         mc-manager.h \
+        mc-remap.h \
 	mc-signals-marshal.h \
 	mission-control-signals-marshal.h \
 	mission-control.h \
@@ -89,7 +90,7 @@ nodist_libmissioncontrol_client_la_SOURCES = \
 libmissioncontrol_client_la_LIBADD = $(GCONF_LIBS) $(GLIB_LIBS) $(DBUS_LIBS) $(TELEPATHY_LIBS)
 
 libmissioncontrol_client_la_LDFLAGS = $(common_ldflags) \
-				      -export-symbols-regex "^(mc_)|(mission_control_)" \
+				      -export-symbols-regex "^(mc_)|(omc_)|(mission_control_)" \
 				      -version-info 4:2:4
 
 mission_control_include = \
@@ -100,10 +101,12 @@ mc-client-lib-gen.h: $(top_builddir)/xml/MissionControl-gen.xml
 	dbus-binding-tool --prefix=mc-client-lib --mode=glib-client $< > $@
 
 %-marshal.h: %-marshal.list Makefile.am
-	glib-genmarshal --header --prefix=$(subst -,_,$*)_marshal $< > $*-marshal.h
+	echo "#include <libmissioncontrol/mc-remap.h>" > $*-marshal.h
+	glib-genmarshal --header --prefix=$(subst -,_,$*)_marshal $< >> $*-marshal.h
 
 %-marshal.c: %-marshal.list Makefile.am
-	glib-genmarshal --body --prefix=$(subst -,_,$*)_marshal $< > $*-marshal.c
+	echo "#include <libmissioncontrol/mc-remap.h>" > $*-marshal.c
+	glib-genmarshal --body --prefix=$(subst -,_,$*)_marshal $< >> $*-marshal.c
 
 mc-enum-types.h: stamp-mc-enum-types.h
 	@true
diff --git a/libmissioncontrol/dbus-api.h b/libmissioncontrol/dbus-api.h
index d7a06694..58d56a66 100644
--- a/libmissioncontrol/dbus-api.h
+++ b/libmissioncontrol/dbus-api.h
@@ -31,6 +31,8 @@
 #define MISSION_CONTROL_IFACE "org.freedesktop.Telepathy.MissionControl"
 #define MISSION_CONTROL_PATH "/org/freedesktop/Telepathy/MissionControl"
 
+#include <libmissioncontrol/mc-remap.h>
+
 #include <libmissioncontrol/_gen/enums.h>
 #include <libmissioncontrol/_gen/gtypes.h>
 #include <libmissioncontrol/_gen/interfaces.h>
diff --git a/libmissioncontrol/mc-account-manager-proxy.h b/libmissioncontrol/mc-account-manager-proxy.h
index 1f79ba38..24415575 100644
--- a/libmissioncontrol/mc-account-manager-proxy.h
+++ b/libmissioncontrol/mc-account-manager-proxy.h
@@ -22,6 +22,7 @@
 #define __LIBMISSIONCONTROL_ACCOUNT_MANAGER_PROXY_H__
 
 #include <telepathy-glib/proxy.h>
+#include <libmissioncontrol/mc-remap.h>
 
 G_BEGIN_DECLS
 
diff --git a/libmissioncontrol/mc-account-proxy.h b/libmissioncontrol/mc-account-proxy.h
index 557c7f95..816fb0d0 100644
--- a/libmissioncontrol/mc-account-proxy.h
+++ b/libmissioncontrol/mc-account-proxy.h
@@ -22,6 +22,7 @@
 #define __LIBMISSIONCONTROL_ACCOUNT_PROXY_H__
 
 #include <telepathy-glib/proxy.h>
+#include <libmissioncontrol/mc-remap.h>
 
 G_BEGIN_DECLS
 
diff --git a/libmissioncontrol/mc-account.h b/libmissioncontrol/mc-account.h
index ba91b196..29cb8385 100644
--- a/libmissioncontrol/mc-account.h
+++ b/libmissioncontrol/mc-account.h
@@ -27,6 +27,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
+#include <libmissioncontrol/mc-remap.h>
+
 G_BEGIN_DECLS
 
 #define MC_TYPE_ACCOUNT mc_account_get_type()
diff --git a/libmissioncontrol/mc-manager.h b/libmissioncontrol/mc-manager.h
index 70433cdf..f1511651 100644
--- a/libmissioncontrol/mc-manager.h
+++ b/libmissioncontrol/mc-manager.h
@@ -27,6 +27,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
+#include <libmissioncontrol/mc-remap.h>
+
 G_BEGIN_DECLS
 
 #define MC_TYPE_MANAGER mc_manager_get_type()
diff --git a/libmissioncontrol/mc-remap.h b/libmissioncontrol/mc-remap.h
new file mode 100644
index 00000000..5dab3ba7
--- /dev/null
+++ b/libmissioncontrol/mc-remap.h
@@ -0,0 +1,154 @@
+/*
+ * This file is part of mission-control
+ *
+ * Copyright (C) 2008 Nokia Corporation. 
+ *
+ * Contact: Alberto Mardegan  <alberto.mardegan@nokia.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#ifndef __MC_REMAP_H__
+#define __MC_REMAP_H__
+
+
+#define mc_account_create omc_account_create
+#define mc_account_delete omc_account_delete
+#define mc_account_free omc_account_free
+#define mc_account_get_alias omc_account_get_alias
+#define mc_account_get_avatar omc_account_get_avatar
+#define mc_account_get_avatar_id omc_account_get_avatar_id
+#define mc_account_get_display_name omc_account_get_display_name
+#define mc_account_get_normalized_name omc_account_get_normalized_name
+#define mc_account_get_param_boolean omc_account_get_param_boolean
+#define mc_account_get_param_int omc_account_get_param_int
+#define mc_account_get_param_string omc_account_get_param_string
+#define mc_account_get_params omc_account_get_params
+#define mc_account_get_profile omc_account_get_profile
+#define mc_account_get_secondary_vcard_fields omc_account_get_secondary_vcard_fields
+#define mc_account_get_supported_presences omc_account_get_supported_presences
+#define mc_account_get_type omc_account_get_type
+#define mc_account_get_unique_name omc_account_get_unique_name
+#define mc_account_is_complete omc_account_is_complete
+#define mc_account_is_enabled omc_account_is_enabled
+#define mc_account_lookup omc_account_lookup
+#define mc_account_lookup_with_profile omc_account_lookup_with_profile
+#define mc_account_lookup_with_vcard_field omc_account_lookup_with_vcard_field
+#define mc_account_manager_proxy_get_type omc_account_manager_proxy_get_type
+#define mc_account_monitor_get_supported_presences omc_account_monitor_get_supported_presences
+#define mc_account_monitor_get_type omc_account_monitor_get_type
+#define mc_account_monitor_new omc_account_monitor_new
+#define mc_account_proxy_get_type omc_account_proxy_get_type
+#define mc_account_reset_avatar_id omc_account_reset_avatar_id
+#define mc_account_set_alias omc_account_set_alias
+#define mc_account_set_avatar omc_account_set_avatar
+#define mc_account_set_avatar_from_data omc_account_set_avatar_from_data
+#define mc_account_set_avatar_mime_type omc_account_set_avatar_mime_type
+#define mc_account_set_avatar_token omc_account_set_avatar_token
+#define mc_account_set_display_name omc_account_set_display_name
+#define mc_account_set_enabled omc_account_set_enabled
+#define mc_account_set_normalized_name omc_account_set_normalized_name
+#define mc_account_set_param_boolean omc_account_set_param_boolean
+#define mc_account_set_param_int omc_account_set_param_int
+#define mc_account_set_param_string omc_account_set_param_string
+#define mc_account_set_secondary_vcard_fields omc_account_set_secondary_vcard_fields
+#define mc_account_supports_presence omc_account_supports_presence
+#define mc_account_unset_param omc_account_unset_param
+#define mc_accounts_filter omc_accounts_filter
+#define mc_accounts_list omc_accounts_list
+#define mc_accounts_list_by_enabled omc_accounts_list_by_enabled
+#define mc_accounts_list_by_profile omc_accounts_list_by_profile
+#define mc_accounts_list_by_secondary_vcard_field omc_accounts_list_by_secondary_vcard_field
+#define mc_accounts_list_by_vcard_field omc_accounts_list_by_vcard_field
+#define mc_accounts_list_free omc_accounts_list_free
+#define mc_cli_account_call_remove omc_cli_account_call_remove
+#define mc_cli_account_call_update_parameters omc_cli_account_call_update_parameters
+#define mc_cli_account_connect_to_account_property_changed omc_cli_account_connect_to_account_property_changed
+#define mc_cli_account_connect_to_removed omc_cli_account_connect_to_removed
+#define mc_cli_account_do_remove omc_cli_account_do_remove
+#define mc_cli_account_do_update_parameters omc_cli_account_do_update_parameters
+#define mc_cli_account_interface_avatar_connect_to_avatar_changed omc_cli_account_interface_avatar_connect_to_avatar_changed
+#define mc_cli_account_manager_call_create_account omc_cli_account_manager_call_create_account
+#define mc_cli_account_manager_connect_to_account_removed omc_cli_account_manager_connect_to_account_removed
+#define mc_cli_account_manager_connect_to_account_validity_changed omc_cli_account_manager_connect_to_account_validity_changed
+#define mc_cli_account_manager_do_create_account omc_cli_account_manager_do_create_account
+#define mc_cli_dbus_properties_do_get omc_cli_dbus_properties_do_get
+#define mc_cli_dbus_properties_do_get_all omc_cli_dbus_properties_do_get_all
+#define mc_cli_dbus_properties_do_set omc_cli_dbus_properties_do_set
+#define mc_filter_flag_get_type omc_filter_flag_get_type
+#define mc_filter_priority_get_type omc_filter_priority_get_type
+#define mc_iface_quark_account omc_iface_quark_account
+#define mc_iface_quark_account_interface_avatar omc_iface_quark_account_interface_avatar
+#define mc_iface_quark_account_interface_compat omc_iface_quark_account_interface_compat
+#define mc_iface_quark_account_interface_conditions omc_iface_quark_account_interface_conditions
+#define mc_iface_quark_account_manager omc_iface_quark_account_manager
+#define mc_iface_quark_account_manager_interface_query omc_iface_quark_account_manager_interface_query
+#define mc_make_resident omc_make_resident
+#define mc_manager_clear_cache omc_manager_clear_cache
+#define mc_manager_free omc_manager_free
+#define mc_manager_get_bus_name omc_manager_get_bus_name
+#define mc_manager_get_filename omc_manager_get_filename
+#define mc_manager_get_object_path omc_manager_get_object_path
+#define mc_manager_get_type omc_manager_get_type
+#define mc_manager_get_unique_name omc_manager_get_unique_name
+#define mc_manager_lookup omc_manager_lookup
+#define mc_managers_free_list omc_managers_free_list
+#define mc_managers_list omc_managers_list
+#define mc_presence_get_type omc_presence_get_type
+#define mc_profile_clear_cache omc_profile_clear_cache
+#define mc_profile_free omc_profile_free
+#define mc_profile_get_avatar_mime_type omc_profile_get_avatar_mime_type
+#define mc_profile_get_branding_icon_name omc_profile_get_branding_icon_name
+#define mc_profile_get_capabilities omc_profile_get_capabilities
+#define mc_profile_get_configuration_ui omc_profile_get_configuration_ui
+#define mc_profile_get_default_account_domain omc_profile_get_default_account_domain
+#define mc_profile_get_default_account_name omc_profile_get_default_account_name
+#define mc_profile_get_default_setting omc_profile_get_default_setting
+#define mc_profile_get_display_name omc_profile_get_display_name
+#define mc_profile_get_icon_name omc_profile_get_icon_name
+#define mc_profile_get_priority omc_profile_get_priority
+#define mc_profile_get_protocol omc_profile_get_protocol
+#define mc_profile_get_protocol_name omc_profile_get_protocol_name
+#define mc_profile_get_supported_presences omc_profile_get_supported_presences
+#define mc_profile_get_type omc_profile_get_type
+#define mc_profile_get_unique_name omc_profile_get_unique_name
+#define mc_profile_get_vcard_field omc_profile_get_vcard_field
+#define mc_profile_get_vcard_mangle omc_profile_get_vcard_mangle
+#define mc_profile_is_default_for_vcard_field omc_profile_is_default_for_vcard_field
+#define mc_profile_lookup omc_profile_lookup
+#define mc_profile_lookup_default_for_vcard_field omc_profile_lookup_default_for_vcard_field
+#define mc_profile_supports_presence omc_profile_supports_presence
+#define mc_profiles_free_list omc_profiles_free_list
+#define mc_profiles_list omc_profiles_list
+#define mc_profiles_list_by_protocol omc_profiles_list_by_protocol
+#define mc_profiles_list_by_vcard_field omc_profiles_list_by_vcard_field
+#define mc_protocol_free omc_protocol_free
+#define mc_protocol_free_params_list omc_protocol_free_params_list
+#define mc_protocol_get_manager omc_protocol_get_manager
+#define mc_protocol_get_name omc_protocol_get_name
+#define mc_protocol_get_params omc_protocol_get_params
+#define mc_protocol_get_type omc_protocol_get_type
+#define mc_protocol_lookup omc_protocol_lookup
+#define mc_protocol_print omc_protocol_print
+#define mc_protocols_free_list omc_protocols_free_list
+#define mc_protocols_list omc_protocols_list
+#define mc_protocols_list_by_manager omc_protocols_list_by_manager
+#define mc_signals_marshal_VOID__STRING_STRING omc_signals_marshal_VOID__STRING_STRING
+#define mc_status_get_type omc_status_get_type
+#define mc_type_dbus_struct_uss omc_type_dbus_struct_uss
+
+#endif
+
diff --git a/libmissioncontrol/mc.h b/libmissioncontrol/mc.h
index 260f52d1..d17f7091 100644
--- a/libmissioncontrol/mc.h
+++ b/libmissioncontrol/mc.h
@@ -25,6 +25,7 @@
 #define __MC_H__
 
 #include <glib-object.h>
+#include <libmissioncontrol/mc-remap.h>
 
 G_BEGIN_DECLS