Clean up send_message to be consistent and don't double-free

6 files changed, 8 insertions, 12 deletions

diff --git a/skype_messaging.c b/skype_messaging.c
index beb667b..04d9b8c 100644
--- a/skype_messaging.c
+++ b/skype_messaging.c
@@ -29,7 +29,7 @@ static gboolean skype_handle_received_message(char *message);
 static void skype_message_received(char *message);
 static gboolean skype_connect();
 static void skype_disconnect();
-static void send_message(char* message);
+static void send_message(const char* message);
 static void hide_skype();
 static gboolean exec_skype();
 
diff --git a/skype_messaging_carbon.c b/skype_messaging_carbon.c
index e47fb25..1b16a2a 100644
--- a/skype_messaging_carbon.c
+++ b/skype_messaging_carbon.c
@@ -136,7 +136,7 @@ skype_disconnect()
 }
 
 static void
-send_message(char* message)
+send_message(const char* message)
 {
 	if (!connected_to_skype)
 	{
diff --git a/skype_messaging_dbus.c b/skype_messaging_dbus.c
index 3782148..469705a 100644
--- a/skype_messaging_dbus.c
+++ b/skype_messaging_dbus.c
@@ -101,7 +101,7 @@ skype_disconnect()
 }
 
 static void
-send_message(char* message)
+send_message(const char* message)
 {
 	GError *error = NULL;
 	gchar *str = NULL;
@@ -130,7 +130,6 @@ send_message(char* message)
 		skype_message_received(str);
 	}
 	
-	g_free(message);
 }
 
 static gboolean
diff --git a/skype_messaging_network.c b/skype_messaging_network.c
index 0e69f92..b518e3e 100644
--- a/skype_messaging_network.c
+++ b/skype_messaging_network.c
@@ -130,8 +130,7 @@ connect_function(gpointer data, gint source, const gchar *error_message)
 	loginmsg = g_strdup_printf("LOGIN %s %s", acct->username, acct->password);
 	send_message(loginmsg);
 	skype_debug_info("skype", "Sending: 'LOGIN {username} {password}'\n");
-	//send_message frees this
-	//g_free(loginmsg);
+	g_free(loginmsg);
 	
 	g_thread_create((GThreadFunc)skype_read_thread, NULL, FALSE, NULL);
 }
@@ -148,7 +147,7 @@ skype_disconnect()
 	if (!connected)
 		return;
 	
-	send_message(g_strdup("QUIT"));
+	send_message("QUIT");
 
 	connected = FALSE;
 	close(source_sock);
@@ -158,7 +157,7 @@ skype_disconnect()
 }
 
 static void
-send_message(char* message)
+send_message(const char* message)
 {
 	int message_num;
 	char *error_return;
@@ -186,8 +185,6 @@ send_message(char* message)
 			g_thread_create((GThreadFunc)skype_message_received, (void *)error_return, FALSE, NULL);
 		}
 	}
-	
-	g_free(message);
 }
 
 static void
diff --git a/skype_messaging_win32.c b/skype_messaging_win32.c
index b8d80fe..2a7e1dc 100644
--- a/skype_messaging_win32.c
+++ b/skype_messaging_win32.c
@@ -131,7 +131,7 @@ skype_disconnect()
 }
 
 static void
-send_message(char* message)
+send_message(const char* message)
 {
 	int message_num;
 	char *error_return;
diff --git a/skype_messaging_x11.c b/skype_messaging_x11.c
index 47800b5..08b2580 100644
--- a/skype_messaging_x11.c
+++ b/skype_messaging_x11.c
@@ -136,7 +136,7 @@ x11_error_handler(Display *disp, XErrorEvent *error)
 
 
 static void
-send_message(char* message)
+send_message(const char* message)
 {
 	unsigned int pos = 0;
 	unsigned int len = strlen( message );