Dolda2000 GitWeb
/
doldaconnect.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b23dedf
)
Fixed 64-bit transfers in the applet.
author
Fredrik Tolf
<fredrik@dolda2000.com>
Thu, 14 Feb 2008 05:29:25 +0000
(06:29 +0100)
committer
Fredrik Tolf
<fredrik@dolda2000.com>
Thu, 14 Feb 2008 05:29:25 +0000
(06:29 +0100)
clients/gnome-trans-applet/conduit.c
patch
|
blob
|
blame
|
history
clients/gnome-trans-applet/conduit.h
patch
|
blob
|
blame
|
history
clients/gnome-trans-applet/dolcon-trans-applet.c
patch
|
blob
|
blame
|
history
diff --git
a/clients/gnome-trans-applet/conduit.c
b/clients/gnome-trans-applet/conduit.c
index
5959a27
..
e667ee6
100644
(file)
--- a/
clients/gnome-trans-applet/conduit.c
+++ b/
clients/gnome-trans-applet/conduit.c
@@
-28,13
+28,13
@@
struct transfer *findtransferbytag(struct conduit *conduit, char *tag)
return(transfer);
}
return(transfer);
}
-void transfersetsize(struct transfer *transfer, int size)
+void transfersetsize(struct transfer *transfer, int
max_t
size)
{
transfer->size = size;
cb_trsize(transfer, transfer->conduit->udata);
}
{
transfer->size = size;
cb_trsize(transfer, transfer->conduit->udata);
}
-void transfersetpos(struct transfer *transfer, int pos)
+void transfersetpos(struct transfer *transfer, int
max_t
pos)
{
transfer->pos = pos;
cb_trpos(transfer, transfer->conduit->udata);
{
transfer->pos = pos;
cb_trpos(transfer, transfer->conduit->udata);
diff --git
a/clients/gnome-trans-applet/conduit.h
b/clients/gnome-trans-applet/conduit.h
index
d38875b
..
0d3b15c
100644
(file)
--- a/
clients/gnome-trans-applet/conduit.h
+++ b/
clients/gnome-trans-applet/conduit.h
@@
-2,6
+2,7
@@
#define _CONDUIT_H
#include <sys/types.h>
#define _CONDUIT_H
#include <sys/types.h>
+#include <stdint.h>
#define CNDS_IDLE 0
#define CNDS_SYN 1
#define CNDS_IDLE 0
#define CNDS_SYN 1
@@
-12,9
+13,9
@@
struct transfer
struct transfer *next, *prev;
struct conduit *conduit;
char *tag; /* UTF8 */
struct transfer *next, *prev;
struct conduit *conduit;
char *tag; /* UTF8 */
- int pos, size;
+ int
max_t
pos, size;
time_t cmptime, ckptime;
time_t cmptime, ckptime;
-
size
_t cmpsize, ckpsize;
+
intmax
_t cmpsize, ckpsize;
int timeout;
};
int timeout;
};
@@
-35,8
+36,8
@@
struct conduitiface
};
struct transfer *findtransferbytag(struct conduit *conduit, char *tag);
};
struct transfer *findtransferbytag(struct conduit *conduit, char *tag);
-void transfersetsize(struct transfer *transfer, int size);
-void transfersetpos(struct transfer *transfer, int pos);
+void transfersetsize(struct transfer *transfer, int
max_t
size);
+void transfersetpos(struct transfer *transfer, int
max_t
pos);
struct transfer *newtransfer(struct conduit *conduit, char *tag, int size, int pos);
void freetransfer(struct transfer *transfer);
struct conduit *newconduit(struct conduitiface *iface, void *udata);
struct transfer *newtransfer(struct conduit *conduit, char *tag, int size, int pos);
void freetransfer(struct transfer *transfer);
struct conduit *newconduit(struct conduitiface *iface, void *udata);
diff --git
a/clients/gnome-trans-applet/dolcon-trans-applet.c
b/clients/gnome-trans-applet/dolcon-trans-applet.c
index
0495560
..
6b4a6e9
100644
(file)
--- a/
clients/gnome-trans-applet/dolcon-trans-applet.c
+++ b/
clients/gnome-trans-applet/dolcon-trans-applet.c
@@
-126,7
+126,7
@@
static void update(struct appletdata *data)
} else {
if((data->curdisplay->pos > 0) && (data->curdisplay->size > 0))
{
} else {
if((data->curdisplay->pos > 0) && (data->curdisplay->size > 0))
{
- sprintf(buf, "%'
i/%'i", data->curdisplay->pos,
data->curdisplay->size);
+ sprintf(buf, "%'
ji/%'ji", (intmax_t)data->curdisplay->pos, (intmax_t)
data->curdisplay->size);
gtk_progress_bar_set_fraction(data->pbar, (double)data->curdisplay->pos / (double)data->curdisplay->size);
gtk_progress_bar_set_text(data->pbar, buf);
} else {
gtk_progress_bar_set_fraction(data->pbar, (double)data->curdisplay->pos / (double)data->curdisplay->size);
gtk_progress_bar_set_text(data->pbar, buf);
} else {