Commit b18d4562 authored by Maxim Cournoyer's avatar Maxim Cournoyer

Drop a C99/C++20 struct initializer and fix typo.

The aggregrated initialization with a designator is standardized
only in C++20 for C++, and was causing build failures for OpenSUSE
leap. Simply abstain from initializing uid as the default value of ""
should be sufficient.

* src/conversationsview.cpp (render_contact_photo): Rename
invalidConverstation to invalidConversation.  Do not explicitly
initialize the 'uid' field.
* src/mainwindow.cpp (CppImpl::getCurrentConversation): Adjust accordingly.

Change-Id: I0a6731910750f30523c2f956fecf5d7e97bceb3a
parent 2dabd384
......@@ -132,9 +132,9 @@ render_contact_photo(G_GNUC_UNUSED GtkTreeViewColumn *tree_column,
isBanned = contactInfo.isBanned;
}
std::shared_ptr<GdkPixbuf> image;
static lrc::api::conversation::Info invalidConverstation = {.uid = "-1"};
static lrc::api::conversation::Info invalidConversation;
auto var_photo = GlobalInstances::pixmapManipulator().conversationPhoto(
convOpt ? convOpt->get() : invalidConverstation,
convOpt ? convOpt->get() : invalidConversation,
**(priv->accountInfo_),
QSize(50, 50),
isPresent
......
......@@ -2255,8 +2255,8 @@ CppImpl::getCurrentConversation(GtkWidget* frame_call)
return incoming_call_view_get_conversation(INCOMING_CALL_VIEW(frame_call));
}
static lrc::api::conversation::Info invalidConverstation;
return invalidConverstation;
static lrc::api::conversation::Info invalidConversation;
return invalidConversation;
}
void
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment