devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 10 Actions Packages Projects 1 Releases Wiki Activity

merge/upstream-full #105

Manually merged
jabber.developer merged 407 commits from merge/upstream-full into master 2026-05-26 17:54:34 +00:00
Conversation 6 Commits 407 Files Changed 303 +4091 -26587
191 changed files with 4091 additions and 26587 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2fb56b8536 - Show all commits

2
src/tools/bookmark_ignore.c
View File

@@ -73,7 +73,7 @@ bookmark_ignore_on_connect(const char* const barejid)
} }
void void
bookmark_ignore_on_disconnect() bookmark_ignore_on_disconnect(void)
{ {
free_keyfile(&bookmark_ignore_prof_keyfile); free_keyfile(&bookmark_ignore_prof_keyfile);
bookmark_ignore_keyfile = NULL; bookmark_ignore_keyfile = NULL;

2
src/tools/bookmark_ignore.h
View File

@@ -37,7 +37,7 @@
#define BOOKMARK_IGNORE_H #define BOOKMARK_IGNORE_H
void bookmark_ignore_on_connect(const char* const barejid); void bookmark_ignore_on_connect(const char* const barejid);
void bookmark_ignore_on_disconnect(); void bookmark_ignore_on_disconnect(void);
gboolean bookmark_ignored(Bookmark* bookmark); gboolean bookmark_ignored(Bookmark* bookmark);
gchar** bookmark_ignore_list(gsize* len); gchar** bookmark_ignore_list(gsize* len);
void bookmark_ignore_add(const char* const barejid); void bookmark_ignore_add(const char* const barejid);

2
src/ui/console.c
View File

@@ -490,7 +490,7 @@ cons_show_wins(gboolean unread)
} }
void void
cons_show_wins_attention() cons_show_wins_attention(void)
{ {
ProfWin* console = wins_get_console(); ProfWin* console = wins_get_console();
cons_show(""); cons_show("");

2
src/ui/ui.h
View File

@@ -268,7 +268,7 @@ void cons_show_contacts(GSList* list);
void cons_show_roster(GSList* list); void cons_show_roster(GSList* list);
void cons_show_roster_group(const char* const group, GSList* list); void cons_show_roster_group(const char* const group, GSList* list);
void cons_show_wins(gboolean unread); void cons_show_wins(gboolean unread);
void cons_show_wins_attention(); void cons_show_wins_attention(void);
gchar* cons_get_string(ProfConsoleWin* conswin); gchar* cons_get_string(ProfConsoleWin* conswin);
void cons_show_status(const char* const barejid); void cons_show_status(const char* const barejid);
void cons_show_info(PContact pcontact); void cons_show_info(PContact pcontact);