64
|
1 |
# HG changeset patch |
|
2 |
# Parent 92fa48ef53c909928706ab4c51518953339a38e4 |
|
3 |
|
|
4 |
diff -r 92fa48ef53c9 mcabber/mcabber/commands.c |
|
5 |
--- a/mcabber/mcabber/commands.c Sun Jan 27 00:40:37 2013 +0200 |
|
6 |
+++ b/mcabber/mcabber/commands.c Thu Feb 21 02:40:11 2013 +0200 |
|
7 |
@@ -2143,6 +2143,7 @@ |
|
8 |
} |
|
9 |
} |
|
10 |
|
|
11 |
+// /rename [-j jid] name |
|
12 |
static void do_rename(char *arg) |
|
13 |
{ |
|
14 |
gpointer bud; |
|
15 |
@@ -2151,9 +2152,43 @@ |
|
16 |
char *newname, *p; |
|
17 |
char *name_utf8; |
|
18 |
|
|
19 |
- if (!current_buddy) |
|
20 |
- return; |
|
21 |
- bud = BUDDATA(current_buddy); |
|
22 |
+ if (arg[0] == '-' && arg[1] == 'j' && arg[2] == ' ') { |
|
23 |
+ GSList *found; |
|
24 |
+ char *jid; |
|
25 |
+ char **args = split_arg(arg, 3, 1); // option, jid, group |
|
26 |
+ if (!args[1] || !*args[1]) { |
|
27 |
+ scr_log_print(LPRINT_NORMAL, "Option -j requires a jid argument."); |
|
28 |
+ free_arg_lst(args); |
|
29 |
+ return; |
|
30 |
+ } |
|
31 |
+ jid = to_utf8(args[1]); |
|
32 |
+ if (check_jid_syntax(jid)) { |
|
33 |
+ scr_log_print(LPRINT_NORMAL, "You must specify a valid jid!"); |
|
34 |
+ g_free(jid); |
|
35 |
+ free_arg_lst(args); |
|
36 |
+ return; |
|
37 |
+ } |
|
38 |
+ found = roster_find (jid, jidsearch, ROSTER_TYPE_USER | |
|
39 |
+ ROSTER_TYPE_ROOM | ROSTER_TYPE_AGENT); |
|
40 |
+ if (!found) { |
|
41 |
+ scr_log_print(LPRINT_NORMAL, "No buddy with jid %s in roster!", jid); |
|
42 |
+ g_free(jid); |
|
43 |
+ free_arg_lst(args); |
|
44 |
+ return; |
|
45 |
+ } |
|
46 |
+ g_free(jid); |
|
47 |
+ bud = found->data; |
|
48 |
+ if (args[2]) // split_arg can return NULL here |
|
49 |
+ newname = g_strdup(args[2]); |
|
50 |
+ else |
|
51 |
+ newname = g_strdup(""); |
|
52 |
+ free_arg_lst(args); |
|
53 |
+ } else { |
|
54 |
+ if (!current_buddy) |
|
55 |
+ return; |
|
56 |
+ bud = BUDDATA(current_buddy); |
|
57 |
+ newname = g_strdup(arg); |
|
58 |
+ } |
|
59 |
|
|
60 |
bjid = buddy_getjid(bud); |
|
61 |
group = buddy_getgroupname(bud); |
|
62 |
@@ -2162,11 +2197,13 @@ |
|
63 |
|
|
64 |
if (type & ROSTER_TYPE_SPECIAL) { |
|
65 |
scr_LogPrint(LPRINT_NORMAL, "You can't rename this item."); |
|
66 |
+ g_free(newname); |
|
67 |
return; |
|
68 |
} |
|
69 |
|
|
70 |
- if (!*arg && !(type & ROSTER_TYPE_GROUP)) { |
|
71 |
+ if ((!newname || !*newname) && !(type & ROSTER_TYPE_GROUP)) { |
|
72 |
scr_LogPrint(LPRINT_NORMAL, "Please specify a new name."); |
|
73 |
+ g_free(newname); |
|
74 |
return; |
|
75 |
} |
|
76 |
|
|
77 |
@@ -2181,7 +2218,6 @@ |
|
78 |
// } |
|
79 |
//} |
|
80 |
|
|
81 |
- newname = g_strdup(arg); |
|
82 |
// Remove trailing space |
|
83 |
for (p = newname; *p; p++) ; |
|
84 |
while (p > newname && *p == ' ') *p = 0; |
|
85 |
@@ -2221,6 +2257,7 @@ |
|
86 |
update_roster = TRUE; |
|
87 |
} |
|
88 |
|
|
89 |
+// /move [-j jid] groupname |
|
90 |
static void do_move(char *arg) |
|
91 |
{ |
|
92 |
gpointer bud; |
|
93 |
@@ -2229,9 +2266,43 @@ |
|
94 |
char *newgroupname, *p; |
|
95 |
char *group_utf8; |
|
96 |
|
|
97 |
- if (!current_buddy) |
|
98 |
- return; |
|
99 |
- bud = BUDDATA(current_buddy); |
|
100 |
+ if (arg[0] == '-' && arg[1] == 'j' && arg[2] == ' ') { |
|
101 |
+ GSList *found; |
|
102 |
+ char *jid; |
|
103 |
+ char **args = split_arg(arg, 3, 1); // option, jid, group |
|
104 |
+ if (!args[1] || !*args[1]) { |
|
105 |
+ scr_log_print(LPRINT_NORMAL, "Option -j requires a jid argument."); |
|
106 |
+ free_arg_lst(args); |
|
107 |
+ return; |
|
108 |
+ } |
|
109 |
+ jid = to_utf8(args[1]); |
|
110 |
+ if (check_jid_syntax(jid)) { |
|
111 |
+ scr_log_print(LPRINT_NORMAL, "You must specify a valid jid!"); |
|
112 |
+ g_free(jid); |
|
113 |
+ free_arg_lst(args); |
|
114 |
+ return; |
|
115 |
+ } |
|
116 |
+ found = roster_find (jid, jidsearch, ROSTER_TYPE_USER | |
|
117 |
+ ROSTER_TYPE_ROOM | ROSTER_TYPE_AGENT); |
|
118 |
+ if (!found) { |
|
119 |
+ scr_log_print(LPRINT_NORMAL, "No buddy with jid %s in roster!", jid); |
|
120 |
+ g_free(jid); |
|
121 |
+ free_arg_lst(args); |
|
122 |
+ return; |
|
123 |
+ } |
|
124 |
+ g_free(jid); |
|
125 |
+ bud = found->data; |
|
126 |
+ if (args[2]) // split_arg can return NULL here |
|
127 |
+ newgroupname = g_strdup(args[2]); |
|
128 |
+ else |
|
129 |
+ newgroupname = g_strdup(""); |
|
130 |
+ free_arg_lst(args); |
|
131 |
+ } else { |
|
132 |
+ if (!current_buddy) |
|
133 |
+ return; |
|
134 |
+ bud = BUDDATA(current_buddy); |
|
135 |
+ newgroupname = g_strdup(arg); |
|
136 |
+ } |
|
137 |
|
|
138 |
bjid = buddy_getjid(bud); |
|
139 |
name = buddy_getname(bud); |
|
140 |
@@ -2242,14 +2313,15 @@ |
|
141 |
|
|
142 |
if (type & ROSTER_TYPE_GROUP) { |
|
143 |
scr_LogPrint(LPRINT_NORMAL, "You can't move groups!"); |
|
144 |
+ g_free(newgroupname); |
|
145 |
return; |
|
146 |
} |
|
147 |
if (type & ROSTER_TYPE_SPECIAL) { |
|
148 |
scr_LogPrint(LPRINT_NORMAL, "You can't move this item."); |
|
149 |
+ g_free(newgroupname); |
|
150 |
return; |
|
151 |
} |
|
152 |
|
|
153 |
- newgroupname = g_strdup(arg); |
|
154 |
// Remove trailing space |
|
155 |
for (p = newgroupname; *p; p++) ; |
|
156 |
while (p > newgroupname && *p == ' ') *p-- = 0; |