diff options
| author | Ben Wiederhake <BenWiederhake.GitHub@gmx.de> | 2020-05-06 16:58:39 +0300 |
|---|---|---|
| committer | Ben Wiederhake <BenWiederhake.GitHub@gmx.de> | 2020-05-06 16:58:39 +0300 |
| commit | e9c442dd8c5176f521b9a67ea5d76a74fed3958b (patch) | |
| tree | 21ebc0f35e44ebe43148ad5665983c1cd7226a2c | |
| parent | 85ff0edd04d822c93120ece64236ce61a5db3eb9 (diff) | |
| parent | 323cab7698e3830db797422a2ad2f6bb2678d272 (diff) | |
Merge remote-tracking branch 'origin/master' into dev-1.4.4
| -rw-r--r-- | Makefile.in | 7 | ||||
| -rw-r--r-- | telegram-base.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index 48bfae9..bbaed9d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -216,15 +216,16 @@ install: noicon_install install -m $(FILE_PERM) imgs/telegram22.png $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/22/telegram.png mkdir -m $(DIR_PERM) -p $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/48 install -m $(FILE_PERM) imgs/telegram48.png $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/48/telegram.png - mkdir -m $(DIR_PERM) -p $(DESTDIR)$(datarootdir)/appdata - install -m $(FILE_PERM) AppStream/telegram-purple.metainfo.xml $(DESTDIR)$(datarootdir)/appdata/telegram-purple.metainfo.xml + mkdir -m $(DIR_PERM) -p $(DESTDIR)$(datarootdir)/metainfo + install -m $(FILE_PERM) AppStream/telegram-purple.metainfo.xml $(DESTDIR)$(datarootdir)/metainfo/telegram-purple.metainfo.xml .PHONY: uninstall uninstall: noicon_uninstall rm -f $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/16/telegram.png rm -f $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/22/telegram.png rm -f $(DESTDIR)$(DATA_ROOT_DIR_PURPLE)/pixmaps/pidgin/protocols/48/telegram.png - rm -f $(DESTDIR)$(datarootdir)/appdata/telegram-purple.metainfo.xml + rm -f $(DESTDIR)$(datarootdir)/appdata/telegram-purple.metainfo.xml # old location + rm -f $(DESTDIR)$(datarootdir)/metainfo/telegram-purple.metainfo.xml # new location ### == The local_{,un}install targets, in case you're not root. == ### diff --git a/telegram-base.c b/telegram-base.c index 19b0b6c..9833bac 100644 --- a/telegram-base.c +++ b/telegram-base.c @@ -406,8 +406,8 @@ gchar *get_download_dir (struct tgl_state *TLS) { dir = g_strconcat ("/tmp", G_DIR_SEPARATOR_S, "downloads", NULL); } else { dir = g_strconcat (TLS->base_path, G_DIR_SEPARATOR_S, "downloads", NULL); - g_mkdir_with_parents (dir, 0700); } + g_mkdir_with_parents (dir, 0700); return dir; } |