stv0g/telegram-purple
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Coding style

Browse source
This commit is contained in:
mjentsch 2015-11-15 14:55:36 +01:00
parent e3d67dd47f
commit 58b7f8c7f9
2 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
telegram-base.c
View file

@ -447,12 +447,14 @@ gchar *get_config_dir (char const *username) {
}
gchar *get_user_pk_path () {
/* This can't be conditional on whether or not we're using telepathy, because
* then we would need to make sure that `make local_install` also knows about
* that location. So we *always* use ${HOME}/.purple/telegram-purple,
* even when the other files aren't in this folder.
* Note that this is only visible when using Telepathy/Empathy with
* local_install, which should be kinda rare anyway (use telepathy-morse!). */
/*
This can't be conditional on whether or not we're using telepathy, because
then we would need to make sure that `make local_install` also knows about
that location. So we *always* use ${HOME}/.purple/telegram-purple,
even when the other files aren't in this folder.
Note that this is only visible when using Telepathy/Empathy with
local_install, which should be kinda rare anyway (use telepathy-morse!).
*/
return g_strconcat (g_get_home_dir(), G_DIR_SEPARATOR_S, ".purple",
G_DIR_SEPARATOR_S, "telegram-purple",
G_DIR_SEPARATOR_S, user_pk_filename, NULL);

14
telegram-purple.c
View file

@ -412,7 +412,7 @@ static void tgprpl_tooltip_text (PurpleBuddy *buddy, PurpleNotifyUserInfo *info,
g_free (status);
}
static GList *tgprpl_status_types (PurpleAccount * acct) {
static GList *tgprpl_status_types (PurpleAccount *acct) {
debug ("tgprpl_status_types()");
GList *types = NULL;
PurpleStatusType *type;
@ -528,20 +528,20 @@ static GList* tgprpl_blist_node_menu (PurpleBlistNode *node) {
tgl_get_peer_type (tgp_blist_buddy_get_id ((PurpleBuddy *)node)) == TGL_PEER_USER) {
// Add encrypted chat option to the right click menu of all buddies
PurpleBuddy* buddy = (PurpleBuddy*)node;
PurpleMenuAction* action = purple_menu_action_new (_("Start secret chat ..."),
PURPLE_CALLBACK(start_secret_chat), buddy, NULL);
PurpleMenuAction* action = purple_menu_action_new (_("Start secret chat ..."), PURPLE_CALLBACK(start_secret_chat),
buddy, NULL);
menu = g_list_append (menu, (gpointer)action);
}
if (PURPLE_BLIST_NODE_IS_CHAT(node)) {
// Generate Public Link
PurpleMenuAction* action = purple_menu_action_new (_("Invite users by link ..."),
PURPLE_CALLBACK(create_chat_link), NULL, NULL);
PurpleMenuAction* action = purple_menu_action_new (_("Invite users by link ..."), PURPLE_CALLBACK(create_chat_link),
NULL, NULL);
menu = g_list_append (menu, (gpointer)action);
}
if (PURPLE_BLIST_NODE_IS_CHAT(node)) {
// Delete self from chat
PurpleMenuAction* action = purple_menu_action_new (_("Delete and exit ..."),
PURPLE_CALLBACK(leave_and_delete_chat), NULL, NULL);
PurpleMenuAction* action = purple_menu_action_new (_("Delete and exit ..."), PURPLE_CALLBACK(leave_and_delete_chat),
NULL, NULL);
menu = g_list_append (menu, (gpointer)action);
}
return menu;