Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
J
jami-client-gnome
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
155
Issues
155
List
Boards
Labels
Service Desk
Milestones
Iterations
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Analytics
Analytics
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
savoirfairelinux
jami-client-gnome
Commits
24d4502a
Commit
24d4502a
authored
Jun 21, 2019
by
Sébastien Blin
Committed by
Adrien Béraud
Jun 21, 2019
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chatview: fix crash when destroying while a signal is executed
Change-Id: I0fd34b2777bbf7c1ebd26e96ea4fcbb86ac55ad5
parent
246c6ae1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
72 additions
and
6 deletions
+72
-6
src/chatview.cpp
src/chatview.cpp
+25
-6
src/ringmainwindow.cpp
src/ringmainwindow.cpp
+47
-0
No files found.
src/chatview.cpp
View file @
24d4502a
...
...
@@ -79,6 +79,8 @@ G_DEFINE_TYPE_WITH_PRIVATE(ChatView, chat_view, GTK_TYPE_BOX);
enum
{
NEW_MESSAGES_DISPLAYED
,
HIDE_VIEW_CLICKED
,
PLACE_CALL_CLICKED
,
PLACE_AUDIO_CALL_CLICKED
,
LAST_SIGNAL
};
...
...
@@ -142,18 +144,15 @@ placecall_clicked(ChatView *self)
{
auto
priv
=
CHAT_VIEW_GET_PRIVATE
(
self
);
if
(
!
priv
->
conversation_
)
return
;
(
*
priv
->
accountInfo_
)
->
conversationModel
->
placeCall
(
priv
->
conversation_
->
uid
);
g_signal_emit
(
G_OBJECT
(
self
),
chat_view_signals
[
PLACE_CALL_CLICKED
],
0
,
priv
->
conversation_
->
uid
.
c_str
()
);
}
static
void
place_audio_call_clicked
(
ChatView
*
self
)
{
auto
priv
=
CHAT_VIEW_GET_PRIVATE
(
self
);
if
(
!
priv
->
conversation_
)
return
;
(
*
priv
->
accountInfo_
)
->
conversationModel
->
placeAudioOnlyCall
(
priv
->
conversation_
->
uid
);
if
(
!
priv
->
conversation_
)
return
;
g_signal_emit
(
G_OBJECT
(
self
),
chat_view_signals
[
PLACE_AUDIO_CALL_CLICKED
],
0
,
priv
->
conversation_
->
uid
.
c_str
());
}
static
void
...
...
@@ -342,6 +341,26 @@ chat_view_class_init(ChatViewClass *klass)
nullptr
,
g_cclosure_marshal_VOID__VOID
,
G_TYPE_NONE
,
0
);
chat_view_signals
[
PLACE_CALL_CLICKED
]
=
g_signal_new
(
"place-call-clicked"
,
G_TYPE_FROM_CLASS
(
klass
),
(
GSignalFlags
)
(
G_SIGNAL_RUN_LAST
|
G_SIGNAL_DETAILED
),
0
,
nullptr
,
nullptr
,
g_cclosure_marshal_VOID__STRING
,
G_TYPE_NONE
,
1
,
G_TYPE_STRING
);
chat_view_signals
[
PLACE_AUDIO_CALL_CLICKED
]
=
g_signal_new
(
"place-audio-call-clicked"
,
G_TYPE_FROM_CLASS
(
klass
),
(
GSignalFlags
)
(
G_SIGNAL_RUN_FIRST
|
G_SIGNAL_ACTION
),
0
,
nullptr
,
nullptr
,
g_cclosure_marshal_VOID__STRING
,
G_TYPE_NONE
,
1
,
G_TYPE_STRING
);
}
static
void
...
...
src/ringmainwindow.cpp
View file @
24d4502a
...
...
@@ -367,6 +367,7 @@ public:
QMetaObject
::
Connection
accountStatusChangedConnection_
;
QMetaObject
::
Connection
profileUpdatedConnection_
;
std
::
string
eventUid_
;
private:
CppImpl
()
=
delete
;
CppImpl
(
const
CppImpl
&
)
=
delete
;
...
...
@@ -421,6 +422,50 @@ on_hide_view_clicked(RingMainWindow* self)
priv
->
cpp
->
resetToWelcome
();
}
static
gboolean
place_call_event
(
RingMainWindow
*
self
)
{
g_return_val_if_fail
(
IS_RING_MAIN_WINDOW
(
self
),
G_SOURCE_REMOVE
);
auto
*
priv
=
RING_MAIN_WINDOW_GET_PRIVATE
(
RING_MAIN_WINDOW
(
self
));
if
(
!
priv
->
cpp
->
eventUid_
.
empty
())
priv
->
cpp
->
accountInfo_
->
conversationModel
->
placeCall
(
priv
->
cpp
->
eventUid_
);
return
G_SOURCE_REMOVE
;
}
static
void
on_place_call_clicked
(
G_GNUC_UNUSED
GtkWidget
*
,
gchar
*
uid
,
RingMainWindow
*
self
)
{
g_return_if_fail
(
IS_RING_MAIN_WINDOW
(
self
)
&&
uid
);
auto
*
priv
=
RING_MAIN_WINDOW_GET_PRIVATE
(
RING_MAIN_WINDOW
(
self
));
priv
->
cpp
->
eventUid_
=
uid
;
g_idle_add
((
GSourceFunc
)
place_call_event
,
self
);
}
static
gboolean
place_audio_call_event
(
RingMainWindow
*
self
)
{
g_return_val_if_fail
(
IS_RING_MAIN_WINDOW
(
self
),
G_SOURCE_REMOVE
);
auto
*
priv
=
RING_MAIN_WINDOW_GET_PRIVATE
(
RING_MAIN_WINDOW
(
self
));
if
(
!
priv
->
cpp
->
eventUid_
.
empty
())
priv
->
cpp
->
accountInfo_
->
conversationModel
->
placeAudioOnlyCall
(
priv
->
cpp
->
eventUid_
);
return
G_SOURCE_REMOVE
;
}
static
void
on_place_audio_call_clicked
(
G_GNUC_UNUSED
GtkWidget
*
,
gchar
*
uid
,
RingMainWindow
*
self
)
{
g_return_if_fail
(
IS_RING_MAIN_WINDOW
(
self
)
&&
uid
);
auto
*
priv
=
RING_MAIN_WINDOW_GET_PRIVATE
(
RING_MAIN_WINDOW
(
self
));
priv
->
cpp
->
eventUid_
=
uid
;
g_idle_add
((
GSourceFunc
)
place_audio_call_event
,
self
);
}
static
void
on_account_creation_completed
(
RingMainWindow
*
self
)
{
...
...
@@ -1335,6 +1380,8 @@ CppImpl::displayChatView(lrc::api::conversation::Info conversation, bool redraw_
chatViewConversation_
.
reset
(
new
lrc
::
api
::
conversation
::
Info
(
conversation
));
auto
*
new_view
=
chat_view_new
(
webkitChatContainer
(
redraw_webview
),
accountInfo_
,
chatViewConversation_
.
get
());
g_signal_connect_swapped
(
new_view
,
"hide-view-clicked"
,
G_CALLBACK
(
on_hide_view_clicked
),
self
);
g_signal_connect
(
new_view
,
"place-call-clicked"
,
G_CALLBACK
(
on_place_call_clicked
),
self
);
g_signal_connect
(
new_view
,
"place-audio-call-clicked"
,
G_CALLBACK
(
on_place_audio_call_clicked
),
self
);
try
{
auto
contactUri
=
chatViewConversation_
->
participants
.
front
();
auto
contactInfo
=
accountInfo_
->
contactModel
->
getContact
(
contactUri
);
...
...
ovari
@ovari
mentioned in issue
#1036 (closed)
·
Jun 22, 2019
mentioned in issue
#1036 (closed)
mentioned in issue #1036
Toggle commit list
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