From b18d4562daa585e2299fd324a9ee5030499cc33f Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
Date: Tue, 13 Jul 2021 15:33:56 -0400
Subject: [PATCH] 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
---
src/conversationsview.cpp | 4 ++--
src/mainwindow.cpp | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/conversationsview.cpp b/src/conversationsview.cpp
index 6fe1bddd..00185c4c 100644
--- a/src/conversationsview.cpp
+++ b/src/conversationsview.cpp
@@ -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
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 187f1f85..6617f987 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -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
--
GitLab