Merge lp:~kees/indicator-messages/trunk-lp-533021 into lp:indicator-messages/0.5

[Kees Cook]

Allocate memory for hash table items (LP: #533021)

[Ted Gould (ted)]

  review approve

On Wed, 2010-04-28 at 10:36 +0000, Kees Cook wrote:
> Kees Cook has proposed merging lp:~kees/indicator-messages/trunk-lp-533021 into lp:indicator-messages.
>
> Requested reviews:
> Indicator Applet Developers (indicator-applet-developers)
> Related bugs:
> #533021 cannot blacklist all messages indicators
> https://bugs.launchpad.net/bugs/533021
>
>
> Allocate memory for hash table items (LP: #533021)
> differences between files attachment (review-diff.txt)
> === modified file 'src/messages-service.c'
> --- src/messages-service..c 2010-04-17 17:59:27 +0000
> +++ src/messages-service.c 2010-04-28 10:36:27 +0000
> @@ -315,7 +315,7 @@
> }
>
> /* Add a definition file into the black list and eclipse
> - and launchers that have the same file. */
> + any launchers that have the same file. */
> static gboolean
> blacklist_add (gpointer udata)
> {
> @@ -359,7 +359,7 @@
> }
>
> /* Actually blacklist this thing */
> - g_hash_table_insert(blacklist, desktop, definition);
> + g_hash_table_insert(blacklist, g_strdup(desktop), g_strdup(definition));
> g_debug("Adding Blacklist item '%s' for desktop '%s'", definition, desktop);
>
> /* Go through and eclipse folks */
>

review: Approve

=== modified file 'src/messages-service.c'
--- src/messages-service.c	2010-04-17 17:59:27 +0000
+++ src/messages-service.c	2010-04-28 10:36:27 +0000
@@ -315,7 +315,7 @@
 }
 
 /* Add a definition file into the black list and eclipse
-   and launchers that have the same file. */
+   any launchers that have the same file. */
 static gboolean
 blacklist_add (gpointer udata)
 {
@@ -359,7 +359,7 @@
 	}
 
 	/* Actually blacklist this thing */
-	g_hash_table_insert(blacklist, desktop, definition);
+	g_hash_table_insert(blacklist, g_strdup(desktop), g_strdup(definition));
 	g_debug("Adding Blacklist item '%s' for desktop '%s'", definition, desktop);
 
 	/* Go through and eclipse folks */