Dolda2000 GitWeb
/
doldaconnect.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2c16e7a
)
Allow connecting to any server in dsh.
author
Fredrik Tolf
<fredrik@dolda2000.com>
Sat, 1 Sep 2007 12:15:39 +0000
(14:15 +0200)
committer
Fredrik Tolf
<fredrik@dolda2000.com>
Sat, 1 Sep 2007 12:15:39 +0000
(14:15 +0200)
clients/gui-shell/dsh.c
patch
|
blob
|
blame
|
history
diff --git
a/clients/gui-shell/dsh.c
b/clients/gui-shell/dsh.c
index
332e0df
..
62cf0e4
100644
(file)
--- a/
clients/gui-shell/dsh.c
+++ b/
clients/gui-shell/dsh.c
@@
-54,6
+54,7
@@
struct trinfo {
void updatewrite(void);
int remote = 0;
void updatewrite(void);
int remote = 0;
+char *server;
GtkStatusIcon *tray;
pid_t dpid = 0, dcpid = 0;
int connected = 0;
GtkStatusIcon *tray;
pid_t dpid = 0, dcpid = 0;
int connected = 0;
@@
-378,7
+379,7
@@
void updatewrite(void)
void connectdc(void)
{
void connectdc(void)
{
- if((dcfd = dc_connect(
remote?NULL:dc_srv_local
)) < 0) {
+ if((dcfd = dc_connect(
server
)) < 0) {
msgbox(GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Could not connect to server: %s"), strerror(errno));
exit(1);
}
msgbox(GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Could not connect to server: %s"), strerror(errno));
exit(1);
}
@@
-543,14
+544,20
@@
int main(int argc, char **argv)
textdomain(PACKAGE);
signal(SIGCHLD, sighandler);
dc_init();
textdomain(PACKAGE);
signal(SIGCHLD, sighandler);
dc_init();
+ server = dc_srv_local;
gtk_init(&argc, &argv);
#ifdef HAVE_NOTIFY
notify_init("Dolda Connect");
#endif
gtk_init(&argc, &argv);
#ifdef HAVE_NOTIFY
notify_init("Dolda Connect");
#endif
- while((c = getopt(argc, argv, "rh")) != -1) {
+ while((c = getopt(argc, argv, "rh
s:
")) != -1) {
switch(c) {
case 'r':
remote = 1;
switch(c) {
case 'r':
remote = 1;
+ server = NULL;
+ break;
+ case 's':
+ remote = 1;
+ server = optarg;
break;
case 'h':
printf("usage: doldacond-shell [-hr]\n");
break;
case 'h':
printf("usage: doldacond-shell [-hr]\n");