Ubuntu Netbook Remix Launcher

Merge lp:~jassmith/netbook-remix-launcher/blank-icon-fix into lp:netbook-remix-launcher

  1. blank-icon-fix
  2. Merge into trunk
Proposed by Jason Smith
Status: Merged
Merged at revision: not available
Proposed branch: lp:~jassmith/netbook-remix-launcher/blank-icon-fix
Merge into: lp:netbook-remix-launcher
Diff against target: None lines
To merge this branch: bzr merge lp:~jassmith/netbook-remix-launcher/blank-icon-fix
Reviewer Review Type Date Requested Status
Neil J. Patel (community) Approve
Review via email: mp+11175@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jason Smith (jassmith) wrote :

Fixes bug #418598, however does not implement tracking as suggested in bug comments. This will be done in a separate merge in preference to getting the quick part of this fix out there.

Revision history for this message
Neil J. Patel (njpatel) wrote :

Approved.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/nl-favorite-app.c'
2--- src/nl-favorite-app.c 2009-07-22 10:45:35 +0000
3+++ src/nl-favorite-app.c 2009-09-04 01:44:30 +0000
4@@ -45,6 +45,7 @@
5 GKeyFile *desktop_file;
6 gchar *uid;
7 gchar *desktop_path;
8+ gboolean loaded;
9
10 ClutterActor *button;
11 ClutterActor *image;
12@@ -186,6 +187,7 @@
13 desktop_path,
14 error->message);
15 g_error_free (error);
16+
17 goto nl_favorite_app_constructed_out;
18 }
19
20@@ -200,6 +202,7 @@
21 desktop_path,
22 error->message);
23 g_error_free (error);
24+
25 goto nl_favorite_app_constructed_out;
26 }
27 name = g_strdup_printf ("<big><b>%s</b></big>", temp);
28@@ -245,6 +248,8 @@
29 g_signal_connect (priv->button, "show-context-menu",
30 G_CALLBACK (on_show_context_menu), object);
31
32+ priv->loaded = TRUE;
33+
34 nl_favorite_app_constructed_out:
35 g_free (temp);
36 g_free (name);
37@@ -302,6 +307,12 @@
38 favorite_app = g_object_new (NL_TYPE_FAVORITE_APP,
39 "uid", uid,
40 NULL);
41+
42+ if (!NL_FAVORITE_APP (favorite_app)->priv->loaded)
43+ {
44+ g_object_unref (favorite_app);
45+ return NULL;
46+ }
47
48 return favorite_app;
49 }

Subscribers

People subscribed via source and target branches