Merge lp:~jeremywootten/pantheon-files/fix-1196427 into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Take own copy of file name when naming bookmark to fix bug #1196427

Fix possible cause of sporadic corruption of bookmark name. gof_file_get_display_name returns an unowned string so take own copy of it.

Difficult to test fully as I cannot reproduce the bug consistently - I do not get this bug after installing ubuntuone. I have not tested with vpn connections etc.

[Cody Garver (codygarver)]

I'm gonna test this a few days. Once it's merged and in a stable release we can set the attached UbuntuOne bug as Incomplete. Does that sound right?

[Cody Garver (codygarver)]

Sorry, I misread your description.

I'll test this a few days to make sure nothing combusts. The attached bug status will become Fix'd upon merge.

[Jeremy Wootten (jeremywootten)]

Yes that's fine - I hope this fixes the bug - or at least does not cause
any regressions!

On 21 November 2013 01:15, Cody Garver <email address hidden> wrote:

> I'm gonna test this a few days. Once it's merged and in a stable release
> we can set the attached UbuntuOne bug as Incomplete. Does that sound right?
> --
>
> https://code.launchpad.net/~jeremywootten/pantheon-files/fix-1196427/+merge/195513
> You are the owner of lp:~jeremywootten/pantheon-files/fix-1196427.
>

--
Jeremy Wootten
GPG Key ID CB585BCD
Key Fingerprint 37C0 3C2A A6D4 E45B BA7C 4328 2DF2 1882 CB58 5BCD

[Victor Martinez (victored)]

Dont forget to free bookmark->name when the bookmark is disposed

[Jeremy Wootten (jeremywootten)]

Good point!

On 21 November 2013 23:21, Victor Martinez <email address hidden> wrote:

> Dont forget to free bookmark->name when the bookmark is disposed
> --
>
> https://code.launchpad.net/~jeremywootten/pantheon-files/fix-1196427/+merge/195513
> You are the owner of lp:~jeremywootten/pantheon-files/fix-1196427.
>

--
Jeremy Wootten
GPG Key ID CB585BCD
Key Fingerprint 37C0 3C2A A6D4 E45B BA7C 4328 2DF2 1882 CB58 5BCD

[Jeremy Wootten (jeremywootten)]

Actually, is this correct? bookmark->name is defined as const char* - you
get a warning if try to free it. I am not really a C programmer so any
advice on what to do would be appreciated ...

On 21 November 2013 23:21, Victor Martinez <email address hidden> wrote:

> Dont forget to free bookmark->name when the bookmark is disposed
> --
>
> https://code.launchpad.net/~jeremywootten/pantheon-files/fix-1196427/+merge/195513
> You are the owner of lp:~jeremywootten/pantheon-files/fix-1196427.
>

--
Jeremy Wootten
GPG Key ID CB585BCD
Key Fingerprint 37C0 3C2A A6D4 E45B BA7C 4328 2DF2 1882 CB58 5BCD

[lp:~jeremywootten/pantheon-files/fix-1196427]

1375. By Launchpad Translations on behalf of elementary-apps on 2013-11-25

Launchpad automatic translations update.

[Victor Martinez (victored)]

Good observation.

I'm pretty sure it was defined as "const char*" because it was an unowned string, so nobody else should free it.

Since the bookmark it taking its own copy now, the "const" should be removed from the definition. It should be just "char *name". Then free it with g_free.

See https://developer.gnome.org/glib/2.36/glib-String-Utility-Functions.html#g-strdup

[Jeremy Wootten (jeremywootten)]

OK, thanks for the advice!

On 25 November 2013 16:35, Victor Martinez <email address hidden> wrote:

> Good observation.
>
> I'm pretty sure it was defined as "const char*" because it was an unowned
> string, so nobody else should free it.
>
> Since the bookmark it taking its own copy now, the "const" should be
> removed from the definition. It should be just "char *name". Then free it
> with g_free.
>
> See
> https://developer.gnome.org/glib/2.36/glib-String-Utility-Functions.html#g-strdup
> --
>
> https://code.launchpad.net/~jeremywootten/pantheon-files/fix-1196427/+merge/195513
> You are the owner of lp:~jeremywootten/pantheon-files/fix-1196427.
>

--
Jeremy Wootten
GPG Key ID CB585BCD
Key Fingerprint 37C0 3C2A A6D4 E45B BA7C 4328 2DF2 1882 CB58 5BCD

[lp:~jeremywootten/pantheon-files/fix-1196427]

1376. By Igor Zubkov on 2013-11-27

Fix typo in ProgressUIHandler.vala

[Cody Garver (codygarver)]

Jeremy, is this branch ready?

[lp:~jeremywootten/pantheon-files/fix-1196427]

1377. By Launchpad Translations on behalf of elementary-apps on 2013-12-02

Launchpad automatic translations update.

[Jeremy Wootten (jeremywootten)]

Sorry Cody, having hardware problems at the moment. Hope to fix soon, but
if someone wants to take this over, please feel free.

On 30 November 2013 18:02, Cody Garver <email address hidden> wrote:

> Jeremy, is this branch ready?
> --
>
> https://code.launchpad.net/~jeremywootten/pantheon-files/fix-1196427/+merge/195513
> You are the owner of lp:~jeremywootten/pantheon-files/fix-1196427.
>

--
Jeremy Wootten
GPG Key ID CB585BCD
Key Fingerprint 37C0 3C2A A6D4 E45B BA7C 4328 2DF2 1882 CB58 5BCD

[lp:~jeremywootten/pantheon-files/fix-1196427]

1378. By Rico Tzschichholz on 2013-12-02

Provide a custom binding to preserve backwards compatibility with a binding change to a libnotify function. Fixes bug #1252491.

1379. By Launchpad Translations on behalf of elementary-apps on 2013-12-03

Launchpad automatic translations update.

1380. By Rico Tzschichholz on 2013-12-04

build: Drop obsolete gconf-2.0 dependency

1381. By Rico Tzschichholz on 2013-12-05

build: Reference and update internal dependencies

1382. By Rico Tzschichholz on 2013-12-05

build: Reference and update internal dependencies of plugins

1383. By Jeremy Wootten on 2013-12-05

New version built on latest revision 1382 of Files. Bookmark takes own copy of name string and frees it on finalize.

[Jeremy Wootten (jeremywootten)]

OK, just pushed a new version based on revision 1382 for testing. This
changes bookmark-> name to a char* and frees it on finalizing, as advised
by Victor.

On 30 November 2013 18:02, Cody Garver <email address hidden> wrote:

> Jeremy, is this branch ready?
> --
>
> https://code.launchpad.net/~jeremywootten/pantheon-files/fix-1196427/+merge/195513
> You are the owner of lp:~jeremywootten/pantheon-files/fix-1196427.
>

--
Jeremy Wootten
GPG Key ID CB585BCD
Key Fingerprint 37C0 3C2A A6D4 E45B BA7C 4328 2DF2 1882 CB58 5BCD

[Julián Unrrein (junrrein)]

You can remove the g_message line. There is already a g_warning a couple of lines after that.

[Jeremy Wootten (jeremywootten)]

OK, I'll do that.

I am not sure what the warning message is for either - it doesn't seem to
be warning of any potential error situation.

On 7 December 2013 18:03, Julián Unrrein <email address hidden> wrote:

> You can remove the g_message line. There is already a g_warning a couple
> of lines after that.
> --
>
> https://code.launchpad.net/~jeremywootten/pantheon-files/fix-1196427/+merge/195513
> You are the owner of lp:~jeremywootten/pantheon-files/fix-1196427.
>

--
Jeremy Wootten
GPG Key ID CB585BCD
Key Fingerprint 37C0 3C2A A6D4 E45B BA7C 4328 2DF2 1882 CB58 5BCD

[lp:~jeremywootten/pantheon-files/fix-1196427]

1384. By Jeremy Wootten on 2013-12-08

Remove unnecessary message

[Jeremy Wootten (jeremywootten)]

Superfluous message removed

On 7 December 2013 18:03, Julián Unrrein <email address hidden> wrote:

> You can remove the g_message line. There is already a g_warning a couple
> of lines after that.
> --
>
> https://code.launchpad.net/~jeremywootten/pantheon-files/fix-1196427/+merge/195513
> You are the owner of lp:~jeremywootten/pantheon-files/fix-1196427.
>

--
Jeremy Wootten
GPG Key ID CB585BCD
Key Fingerprint 37C0 3C2A A6D4 E45B BA7C 4328 2DF2 1882 CB58 5BCD

=== modified file 'src/marlin-bookmark.c'
--- src/marlin-bookmark.c	2013-09-09 03:08:16 +0000
+++ src/marlin-bookmark.c	2013-12-08 15:54:45 +0000
@@ -54,6 +54,7 @@
     bookmark = MARLIN_BOOKMARK (object);
     marlin_bookmark_disconnect_file (bookmark);	
     g_free (bookmark->label);
+    g_free (bookmark->name);
     //SPOTTED!
     g_warning ("%s", G_STRFUNC);
     g_object_unref (bookmark->file);
@@ -304,7 +305,7 @@
     if (bookmark->label != NULL) 
         bookmark->name = bookmark->label;
     else
-        bookmark->name = gof_file_get_display_name (bookmark->file);
+        bookmark->name = g_strdup (gof_file_get_display_name (bookmark->file));
         
     g_signal_emit (bookmark, signals[CONTENTS_CHANGED], 0);
 }

=== modified file 'src/marlin-bookmark.h'
--- src/marlin-bookmark.h	2013-09-09 03:08:16 +0000
+++ src/marlin-bookmark.h	2013-12-08 15:54:45 +0000
@@ -44,7 +44,7 @@
 
 struct MarlinBookmark {
     GObject object;
-    const char  *name;
+    char  *name;
     char        *label;
     GOFFile     *file;
     GFileMonitor *monitor;