Changeset 2470
- Timestamp:
- 08/19/07 03:20:41 (1 year ago)
- Files:
-
- plugins/opie-sync/src/opie_qcop.c (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
plugins/opie-sync/src/opie_qcop.c
r1695 r2470 164 164 { 165 165 if (failstr && (strlen(failstr) > 0) && (strstr(pc, failstr))) { 166 qconn->resultmsg = g_strdup(errmsg);167 return FALSE;168 }166 qconn->resultmsg = g_strdup(errmsg); 167 return FALSE; 168 } 169 169 170 if (strstr(pc,"cancelSync"))171 { 172 g_free(pc);173 qconn->resultmsg = g_strdup("User cancelled sync");174 return FALSE;170 if (strstr(pc,"cancelSync")) 171 { 172 g_free(pc); 173 qconn->resultmsg = g_strdup("User cancelled sync"); 174 return FALSE; 175 175 } 176 176 else 177 177 { 178 g_free(pc);179 return expect(qconn, str, failstr, errmsg);178 g_free(pc); 179 return expect(qconn, str, failstr, errmsg); 180 180 } 181 181 } … … 203 203 if(strstr(pc,"200") && flushing) 204 204 { 205 g_free(pc);206 return expect(qconn, "flushDone", NULL, errmsg);205 g_free(pc); 206 return expect(qconn, "flushDone", NULL, errmsg); 207 207 } 208 208 else 209 209 { 210 g_free(pc);211 return TRUE;210 g_free(pc); 211 return TRUE; 212 212 } 213 213 } 214 214 else 215 { 215 216 if (strstr(pc,"cancelSync")) 216 217 { 217 g_free(pc);218 qconn->resultmsg = g_strdup("User cancelled sync");219 return FALSE;218 g_free(pc); 219 qconn->resultmsg = g_strdup("User cancelled sync"); 220 return FALSE; 220 221 } 221 222 else 222 223 { 223 g_free(pc); 224 return expect_special(qconn, errmsg, flushing); 225 } 224 g_free(pc); 225 return expect_special(qconn, errmsg, flushing); 226 } 227 } 226 228 } 227 229 else … … 498 500 if ( mon_pc ) 499 501 { 500 if (strstr(mon_pc,"cancelSync()"))502 if (strstr(mon_pc,"cancelSync()")) 501 503 { 502 g_free(mon_pc); 503 data->qconn->syncing = FALSE;504 (data->cancel_routine)(); 505 }506 else507 {508 perror("Error on select() call or no data");509 g_free(mon_pc);510 }504 g_free(mon_pc); 505 data->qconn->syncing = FALSE; 506 (data->cancel_routine)(); 507 } 508 else 509 { 510 perror("Error on select() call or no data"); 511 g_free(mon_pc); 512 } 511 513 } 512 514 }
