Lines 1-45
Link Here
|
1 |
--- face/lmenu.cc.orig Wed Oct 20 02:49:13 1999 |
1 |
diff -ru ./socket.cc ../../nt-1.07.1/main/socket.cc |
2 |
+++ face/lmenu.cc Wed Oct 20 02:52:39 1999 |
2 |
--- ./socket.cc Thu Nov 4 02:49:09 1999 |
3 |
@@ -66,7 +66,7 @@ |
3 |
+++ ../../nt-1.07.1/main/socket.cc Thu Nov 25 22:18:21 1999 |
4 |
|
4 |
@@ -9,6 +9,10 @@ |
5 |
ListMenu=gtk_menu_new(); |
5 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
6 |
pixmap=make_pixmap_from_xpm(&bitmap,logmini_xpm); |
6 |
*/ |
7 |
- menu_item=make_menu_item(_("View log"),NULL,pixmap,bitmap); |
7 |
|
8 |
+ menu_item=make_menu_item(_("View log"),(char*)NULL,pixmap,bitmap); |
8 |
+#if (defined(__unix__) || defined(unix)) && !defined(USG) |
9 |
gtk_menu_append(GTK_MENU(ListMenu),menu_item); |
9 |
+#include <sys/param.h> |
10 |
ListMenuArray[LM_LOG]=menu_item; |
10 |
+#endif |
11 |
gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(open_log_for_selected),NULL); |
11 |
+ |
12 |
@@ -79,7 +79,7 @@ |
12 |
#include <stdio.h> |
13 |
gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(stop_downloads),NULL); |
13 |
#include <stdlib.h> |
14 |
|
14 |
#include <string.h> |
15 |
pixmap=make_pixmap_from_xpm(&bitmap,runmini_xpm); |
15 |
@@ -37,6 +41,7 @@ |
16 |
- menu_item=make_menu_item(_("Continue downloads"),NULL,pixmap,bitmap); |
16 |
if (!buffer) buffer=new char[MAX_LEN]; |
17 |
+ menu_item=make_menu_item(_("Continue downloads"),(char*)NULL,pixmap,bitmap); |
17 |
hostent *hpr=&hp; |
18 |
gtk_menu_append(GTK_MENU(ListMenu),menu_item); |
18 |
temp_variable=0; |
19 |
ListMenuArray[LM_CONTINUE]=menu_item; |
19 |
+#if !(defined(BSD) && (BSD >= 199306)) |
20 |
gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(continue_downloads),NULL); |
20 |
#ifdef __sparc__ |
21 |
@@ -100,13 +100,13 @@ |
21 |
gethostbyname_r(host,&hp,buffer,MAX_LEN,&temp_variable); |
22 |
gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(ask_delete_download),NULL); |
22 |
#else |
23 |
|
23 |
@@ -44,11 +49,11 @@ |
24 |
pixmap=make_pixmap_from_xpm(&bitmap,delcommini_xpm); |
24 |
#endif |
25 |
- menu_item=make_menu_item(_("Delete completed"),NULL,pixmap,bitmap); |
25 |
if (temp_variable) return -1; |
26 |
+ menu_item=make_menu_item(_("Delete completed"),(char*)NULL,pixmap,bitmap); |
26 |
memcpy((char *)&info.sin_addr,(char *)hpr->h_addr,hpr->h_length); |
27 |
gtk_menu_append(GTK_MENU(ListMenu),menu_item); |
27 |
- /* |
28 |
ListMenuArray[LM_DELC]=menu_item; |
28 |
+#else /* !(defined(BSD) && (BSD >= 199306)) */ |
29 |
gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(ask_delete_completed_downloads),NULL); |
29 |
hostent *hp=gethostbyname(host); |
30 |
|
30 |
if (!hp) return -1; |
31 |
|
31 |
memcpy((char *)&info.sin_addr,(char *)hp->h_addr,hp->h_length); |
32 |
- menu_item=make_menu_item(_("Delete failed"),NULL,NULL,NULL); |
32 |
- */ |
33 |
+ menu_item=make_menu_item(_("Delete failed"),(char*)NULL,(GdkPixmap*)NULL,(GdkBitmap*)NULL); |
33 |
+#endif /* !(defined(BSD) && (BSD >= 199306)) */ |
34 |
gtk_menu_append(GTK_MENU(ListMenu),menu_item); |
34 |
} else info.sin_addr.s_addr=INADDR_ANY; |
35 |
ListMenuArray[LM_DELF]=menu_item; |
35 |
info.sin_port=htons(port); |
36 |
gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(ask_delete_fataled_downloads),NULL); |
36 |
return sizeof(info); |
37 |
@@ -128,7 +128,7 @@ |
|
|
38 |
ListMenuArray[LM_MOVEDOWN]=menu_item; |
39 |
gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(move_download_down),NULL); |
40 |
|
41 |
- menu_item=make_menu_item(_("Set limitation"),NULL,NULL,NULL); |
42 |
+ menu_item=make_menu_item(_("Set limitation"),(char*)NULL,(GdkPixmap*)NULL,(GdkBitmap*)NULL); |
43 |
gtk_menu_append(GTK_MENU(ListMenu),menu_item); |
44 |
ListMenuArray[LM_SET_LIMIT]=menu_item; |
45 |
gtk_signal_connect(GTK_OBJECT(menu_item),"activate",GTK_SIGNAL_FUNC(set_limit_to_download),NULL); |