aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Merge branch 'master' into osx-functional

Browse Source
This commit is contained in:
James Booth 2016-07-25 01:30:42 +01:00
commit e363c8ef3e
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/pgp/gpg.c
View File

@ -159,6 +159,7 @@ p_gpg_on_connect(const char *const barejid)
{ {
char *pgpdir = files_get_data_path(DIR_PGP); char *pgpdir = files_get_data_path(DIR_PGP);
GString *pubsfile = g_string_new(pgpdir); GString *pubsfile = g_string_new(pgpdir);
free(pgpdir);
gchar *account_dir = str_replace(barejid, "@", "_at_"); gchar *account_dir = str_replace(barejid, "@", "_at_");
g_string_append(pubsfile, "/"); g_string_append(pubsfile, "/");
g_string_append(pubsfile, account_dir); g_string_append(pubsfile, account_dir);

7
src/ui/statusbar.c
View File

@ -61,6 +61,7 @@ static int is_active[12];
static GHashTable *remaining_active; static GHashTable *remaining_active;
static int is_new[12]; static int is_new[12];
static GHashTable *remaining_new; static GHashTable *remaining_new;
static GTimeZone *tz;
static GDateTime *last_time; static GDateTime *last_time;
static int current; static int current;
@ -95,10 +96,12 @@ create_status_bar(void)
mvwprintw(status_bar, 0, cols - 34 + ((current - 1) * 3), bracket); mvwprintw(status_bar, 0, cols - 34 + ((current - 1) * 3), bracket);
wattroff(status_bar, bracket_attrs); wattroff(status_bar, bracket_attrs);
tz = g_time_zone_new_local();
if (last_time) { if (last_time) {
g_date_time_unref(last_time); g_date_time_unref(last_time);
} }
last_time = g_date_time_new_now_local(); last_time = g_date_time_new_now(tz);
_status_bar_draw(); _status_bar_draw();
} }
@ -451,7 +454,7 @@ _status_bar_draw(void)
if (last_time) { if (last_time) {
g_date_time_unref(last_time); g_date_time_unref(last_time);
} }
last_time = g_date_time_new_now_local(); last_time = g_date_time_new_now(tz);
int bracket_attrs = theme_attrs(THEME_STATUS_BRACKET); int bracket_attrs = theme_attrs(THEME_STATUS_BRACKET);