projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
* changed the parent class of ModestTnyMsgView from GtkFrame to GtkTextView to get...
[modest]
/
src
/
modest-tny-account-store.c
diff --git
a/src/modest-tny-account-store.c
b/src/modest-tny-account-store.c
index
0ad616a
..
21456ca
100644
(file)
--- a/
src/modest-tny-account-store.c
+++ b/
src/modest-tny-account-store.c
@@
-226,13
+226,9
@@
get_password (TnyAccountIface *account, const gchar *prompt)
/* g_signal_emit (G_OBJECT(self), signals[PASSWORD_REQUESTED_SIGNAL], 0, key); */
g_signal_emit (G_OBJECT(self), signals[PASSWORD_REQUESTED_SIGNAL], 0, key);
-<<<<<<< .mine
}
return val;
-=======
- return val;
->>>>>>> .r67
}