Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#524: add more sort method and view method #539

Merged
merged 25 commits into from
Apr 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/iptux-core/CoreThreadTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ TEST(CoreThread, SendMsgPara) {
thread->AttachPalToList(pal);
ChipData chipData("hello world");
MsgPara para(pal);
para.dtlist.push_back(move(chipData));
para.dtlist.push_back(std::move(chipData));
EXPECT_TRUE(thread->SendMsgPara(para));
delete thread;
}
Expand Down
6 changes: 3 additions & 3 deletions src/iptux/DialogGroup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -717,14 +717,14 @@ void DialogGroup::onSortType(GSimpleAction* action,
}

void DialogGroup::CreateTitle() {
if(app->use_header_bar()) {
GtkHeaderBar* header_bar = CreateHeaderBar(GTK_WINDOW(window), app->menu());
if (app->use_header_bar()) {
GtkHeaderBar* header_bar = CreateHeaderBar(GTK_WINDOW(window), app->menu());
gtk_header_bar_set_title(header_bar, GetTitle().c_str());
}
}

string DialogGroup::GetTitle() {
return stringFormat(_("Talk with the group %s"), grpinf->name.c_str());
return stringFormat(_("Talk with the group %s"), grpinf->name().c_str());
}

} // namespace iptux
2 changes: 1 addition & 1 deletion src/iptux/DialogGroupTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ TEST(DialogGroup, Constructor) {
pal->iconfile = g_strdup("pig");

GroupInfo groupInfo(GROUP_BELONG_TYPE_SEGMENT, vector<PPalInfo>({pal}),
app.getMe(), nullptr);
app.getMe(), "groupname", nullptr);

DialogGroup* dialog = DialogGroup::GroupDialogEntry(&app, &groupInfo);
delete dialog;
Expand Down
Loading
Loading