Merge lp:~khadgaray/indicator-messages/lp-1003898 into lp:indicator-messages/0.3

Proposed by Ritesh Khadgaray on 2012-11-07
Status: Merged
Approved by: Lars Karlitski on 2012-11-07
Approved revision: 271
Merge reported by: Lars Karlitski
Merged at revision: not available
Proposed branch: lp:~khadgaray/indicator-messages/lp-1003898
Merge into: lp:indicator-messages/0.3
Diff against target: 14 lines (+2/-2)
1 file modified
src/seen-db.c (+2/-2)
To merge this branch: bzr merge lp:~khadgaray/indicator-messages/lp-1003898
Reviewer Review Type Date Requested Status
Lars Karlitski (community) 2012-11-07 Approve on 2012-11-07
Review via email: mp+133304@code.launchpad.net

Commit message

seen-db: make global variables static to avoid crash when using pkcs11

Description of the change

indicator-messages-service crashes after login if using pkcs11 authentication (lp# 1003898)

The patch is trivial, test by the customer and works for them. This has a very low probability of introducing any regression.

To post a comment you must log in.
Lars Karlitski (larsu) wrote :

Looks great, thanks Ritesh!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/seen-db.c'
2--- src/seen-db.c 2010-03-25 15:25:13 +0000
3+++ src/seen-db.c 2012-11-07 17:37:27 +0000
4@@ -25,8 +25,8 @@
5 #define KEY_NAME "DesktopFiles"
6
7 GHashTable * seendb = NULL;
8-gchar * filename = NULL;
9-gchar * dirname = NULL;
10+static gchar * filename = NULL;
11+static gchar * dirname = NULL;
12 guint write_process = 0;
13
14 /* Build the hashtable and then see if we have a keyfile that

Subscribers

People subscribed via source and target branches