Added #ifdefs for INSTANTBIRD so the IB people can compile on their butchered version of glib

5 files changed, 17 insertions, 3 deletions

diff --git a/libskype.c b/libskype.c
index b612748..1c0ca0f 100644
--- a/libskype.c
+++ b/libskype.c
@@ -1421,6 +1421,7 @@ skype_update_buddy_icon(PurpleBuddy *buddy)
 			g_error_free(error);
 		}
 	}
+#ifndef INSTANTBIRD
 	if (api_supports_avatar == 2 || api_supports_avatar == -1)
 	{
 		const gchar *userfiles[] = {"user256", "user1024", "user4096", "user16384", "user32768", "user65536",
@@ -1479,6 +1480,7 @@ skype_update_buddy_icon(PurpleBuddy *buddy)
 		}
 		g_free(username);
 	}
+#endif
 	if (api_supports_avatar == 3)
 	{
 		filename = g_strconcat("http://", purple_account_get_string(acct, "host", "skype.robbmob.com"), "/avatars/", buddy->name, NULL);
diff --git a/skype_messaging_carbon.c b/skype_messaging_carbon.c
index 47863c9..0557bf0 100644
--- a/skype_messaging_carbon.c
+++ b/skype_messaging_carbon.c
@@ -205,10 +205,10 @@ hide_skype()
 static gboolean
 exec_skype()
 {
-	gboolean success;
-	
+	gboolean success = FALSE;
+#ifndef INSTANTBIRD	
 	success = g_spawn_command_line_async("/Applications/Skype.app/Contents/MacOS/Skype", NULL);
-	
+#endif	
 	return success;
 }
 
diff --git a/skype_messaging_dbus.c b/skype_messaging_dbus.c
index 8d0909c..78f134a 100644
--- a/skype_messaging_dbus.c
+++ b/skype_messaging_dbus.c
@@ -211,6 +211,9 @@ hide_skype()
 static gboolean
 exec_skype()
 {
+#ifdef INSTANTBIRD
+	return FALSE;
+#else
 	GError *error;
 	if (g_spawn_command_line_async("skype --enable-dbus --use-session-dbus --disable-cleanlooks", &error))
 	{
@@ -219,5 +222,6 @@ exec_skype()
 		skype_debug_error("skype", "Could not start skype: %s\n", error->message);
 		return FALSE;
 	}
+#endif
 }
 
diff --git a/skype_messaging_win32.c b/skype_messaging_win32.c
index 5230287..263a0f3 100644
--- a/skype_messaging_win32.c
+++ b/skype_messaging_win32.c
@@ -200,6 +200,9 @@ hide_skype()
 static gboolean
 exec_skype()
 {
+#ifdef INSTANTBIRD
+	return FALSE;
+#else
 	DWORD size = 0;
 	gchar *path, *pathtemp;
 	HKEY regkey;
@@ -235,6 +238,7 @@ exec_skype()
 	success = g_spawn_command_line_async(pathtemp, NULL);
 	g_free(pathtemp);
 	return success;
+#endif
 }
 
 static gboolean
diff --git a/skype_messaging_x11.c b/skype_messaging_x11.c
index a10e90a..3814e12 100644
--- a/skype_messaging_x11.c
+++ b/skype_messaging_x11.c
@@ -280,6 +280,9 @@ hide_skype()
 static gboolean
 exec_skype()
 {
+#ifdef INSTANTBIRD
+	return FALSE;
+#else
 	GError *error;
 	
 #ifdef USE_XVFB_SERVER	
@@ -334,6 +337,7 @@ exec_skype()
 		skype_debug_error("skype", "Could not start skype: %s\n", error->message);
 		return FALSE;
 	}
+#endif
 }
 
 static gboolean