Mercurial > pidgin

comparison libpurple/plugins/autoaccept.c @ 32819:2c6510167895 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin.2.x.y' (head 3315c5dfbd0ad16511bdcf865e5b07c02d07df24) to branch 'im.pidgin.pidgin' (head cbd1eda6bcbf0565ae7766396bb8f6f419cb6a9a)
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sat, 02 Jun 2012 02:30:49 +0000
parents 8404c5b75e99
children
comparison
equal deleted inserted replaced
32818:01ff09d4a463 32819:2c6510167895
71 71
72 static void 72 static void
73 auto_accept_complete_cb(PurpleXfer *xfer, PurpleXfer *my) 73 auto_accept_complete_cb(PurpleXfer *xfer, PurpleXfer *my)
74 { 74 {
75 if (xfer == my && purple_prefs_get_bool(PREF_NOTIFY) && 75 if (xfer == my && purple_prefs_get_bool(PREF_NOTIFY) &&
76 !purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, xfer->who, xfer->account)) 76 !purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, purple_xfer_get_remote_user(xfer), purple_xfer_get_account(xfer)))
77 { 77 {
78 char *message = g_strdup_printf(_("Autoaccepted file transfer of \"%s\" from \"%s\" completed."), 78 char *message = g_strdup_printf(_("Autoaccepted file transfer of \"%s\" from \"%s\" completed."),
79 xfer->filename, xfer->who); 79 purple_xfer_get_filename(xfer), purple_xfer_get_remote_user(xfer));
80 purple_notify_info(NULL, _("Autoaccept complete"), message, NULL); 80 purple_notify_info(NULL, _("Autoaccept complete"), message, NULL);
81 g_free(message); 81 g_free(message);
82 } 82 }
83 } 83 }
84 84
91 char *filename; 91 char *filename;
92 char *dirname; 92 char *dirname;
93 93
94 int accept_setting; 94 int accept_setting;
95 95
96 account = xfer->account; 96 account = purple_xfer_get_account(xfer);
97 node = PURPLE_BLIST_NODE(purple_find_buddy(account, xfer->who)); 97 node = PURPLE_BLIST_NODE(purple_find_buddy(account, purple_xfer_get_remote_user(xfer)));
98 98
99 /* If person is on buddy list, use the buddy setting; otherwise, use the 99 /* If person is on buddy list, use the buddy setting; otherwise, use the
100 stranger setting. */ 100 stranger setting. */
101 if (node) { 101 if (node) {
102 node = purple_blist_node_get_parent(node); 102 node = purple_blist_node_get_parent(node);
119 gchar **name_and_ext; 119 gchar **name_and_ext;
120 const gchar *name; 120 const gchar *name;
121 gchar *ext; 121 gchar *ext;
122 122
123 if (purple_prefs_get_bool(PREF_NEWDIR)) 123 if (purple_prefs_get_bool(PREF_NEWDIR))
124 dirname = g_build_filename(pref, purple_normalize(account, xfer->who), NULL); 124 dirname = g_build_filename(pref, purple_normalize(account, purple_xfer_get_remote_user(xfer)), NULL);
125 else 125 else
126 dirname = g_build_filename(pref, NULL); 126 dirname = g_build_filename(pref, NULL);
127 127
128 if (!ensure_path_exists(dirname)) 128 if (!ensure_path_exists(dirname))
129 { 129 {
131 break; 131 break;
132 } 132 }
133 133
134 /* Escape filename (if escaping is turned on) */ 134 /* Escape filename (if escaping is turned on) */
135 if (purple_prefs_get_bool(PREF_ESCAPE)) { 135 if (purple_prefs_get_bool(PREF_ESCAPE)) {
136 escape = purple_escape_filename(xfer->filename); 136 escape = purple_escape_filename(purple_xfer_get_filename(xfer));
137 } else { 137 } else {
138 escape = xfer->filename; 138 escape = purple_xfer_get_filename(xfer);
139 } 139 }
140 filename = g_build_filename(dirname, escape, NULL); 140 filename = g_build_filename(dirname, escape, NULL);
141 141
142 /* Split at the first dot, to avoid uniquifying "foo.tar.gz" to "foo.tar-2.gz" */ 142 /* Split at the first dot, to avoid uniquifying "foo.tar.gz" to "foo.tar-2.gz" */
143 name_and_ext = g_strsplit(escape, ".", 2); 143 name_and_ext = g_strsplit(escape, ".", 2);
172 172
173 purple_signal_connect(purple_xfers_get_handle(), "file-recv-complete", handle, 173 purple_signal_connect(purple_xfers_get_handle(), "file-recv-complete", handle,
174 PURPLE_CALLBACK(auto_accept_complete_cb), xfer); 174 PURPLE_CALLBACK(auto_accept_complete_cb), xfer);
175 break; 175 break;
176 case FT_REJECT: 176 case FT_REJECT:
177 xfer->status = PURPLE_XFER_STATUS_CANCEL_LOCAL; 177 purple_xfer_set_status(xfer, PURPLE_XFER_STATUS_CANCEL_LOCAL);
178 break; 178 break;
179 } 179 }
180 } 180 }
181 181
182 static void 182 static void