Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Librem5
debs
gnome-contacts
Commits
65090f18
Commit
65090f18
authored
Nov 07, 2020
by
Niels De Graef
Browse files
Fix build when -Dtelepathy=true
(cherry picked from commit
cbcb28f9
)
parent
71cc6e91
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/contacts-contact-list.vala
View file @
65090f18
...
...
@@ -243,7 +243,7 @@ public class Contacts.ContactList : ListBox {
selection_changed
(
individual
);
#if HAVE_TELEPATHY
if
(
individual
!=
null
)
Contact
.
fetch_contact_info
(
individual
);
Utils
.
fetch_contact_info
(
individual
);
#endif
}
...
...
src/contacts-contact-sheet.vala
View file @
65090f18
...
...
@@ -27,6 +27,7 @@ using Gee;
public
class
Contacts
.
ContactSheet
:
Grid
{
private
int
last_row
=
0
;
private
Individual
individual
;
private
unowned
Store
store
;
public
bool
narrow
{
get
;
set
;
default
=
true
;
}
private
const
string
[]
SORTED_PROPERTIES
=
{
...
...
@@ -43,6 +44,7 @@ public class Contacts.ContactSheet : Grid {
public
ContactSheet
(
Individual
individual
,
Store
store
)
{
Object
(
row_spacing
:
12
,
column_spacing
:
12
);
this
.
individual
=
individual
;
this
.
store
=
store
;
this
.
individual
.
notify
.
connect
(
update
);
this
.
individual
.
personas_changed
.
connect
(
update
);
...
...
@@ -242,7 +244,7 @@ public class Contacts.ContactSheet : Grid {
var
type
=
im_persona
.
presence_type
;
if
(
type
!=
PresenceType
.
UNSET
&&
type
!=
PresenceType
.
ERROR
&&
type
!=
PresenceType
.
OFFLINE
&&
type
!=
PresenceType
.
UNKNOWN
)
{
Utils
.
start_chat
(
this
.
contact
,
protocol
,
id
.
value
);
Utils
.
start_chat
(
this
.
individual
,
protocol
,
id
.
value
);
}
}
});
...
...
src/contacts-utils.vala
View file @
65090f18
...
...
@@ -80,8 +80,8 @@ namespace Contacts.Utils {
}
#if HAVE_TELEPATHY
public
void
start_chat
(
Contact
contact
,
string
protocol
,
string
id
)
{
var
im_persona
=
contact
.
find_im_persona
(
protocol
,
id
);
public
void
start_chat
(
Individual
individual
,
string
protocol
,
string
id
)
{
var
im_persona
=
Utils
.
find_im_persona
(
individual
,
protocol
,
id
);
var
account
=
(
im_persona
.
store
as
Tpf
.
PersonaStore
).
account
;
var
request_dict
=
new
HashTable
<
string
,
Value
?>(
str_hash
,
str_equal
);
request_dict
.
insert
(
TelepathyGLib
.
PROP_CHANNEL_CHANNEL_TYPE
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment