[Netadm-devel] gwc/gwcguid apc.c,1.1.1.1,1.2 callback.c,1.1.1.1,1.2 fwc.c,1.1.1.1,1.2 interface.c,1.
Status: Beta
Brought to you by:
linuxpark
Menu
▾
▴
[Netadm-devel] gwc/gwcguid apc.c,1.1.1.1,1.2 callback.c,1.1.1.1,1.2 fwc.c,1.1.1.1,1.2 interface.c,1.2,1.3 interface.h,1.1.1.1,1.2 qos.c,1.1.1.1,1.2
|
From: 똥꼬 <lin...@us...> - 2006-01-31 14:52:15
|
Update of /cvsroot/netadm/gwc/gwcguid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21941 Modified Files: apc.c callback.c fwc.c interface.c interface.h qos.c Log Message: MOD: modify winError as userwin .. general user window Index: callback.c =================================================================== RCS file: /cvsroot/netadm/gwc/gwcguid/callback.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** callback.c 30 Jan 2006 17:41:29 -0000 1.1.1.1 --- callback.c 31 Jan 2006 14:51:58 -0000 1.2 *************** *** 79,83 **** } else { ! winError((const char *) error); set_item_statusbar("Failed to Auto Test configp"); } --- 79,83 ---- } else { ! userwin( USERWIN_ERROR, (const char *) error); set_item_statusbar("Failed to Auto Test configp"); } *************** *** 98,102 **** } else { ! winError((const char *) error); set_item_statusbar("Failed to apply Auto Test config"); } --- 98,102 ---- } else { ! userwin( USERWIN_ERROR, (const char *) error); set_item_statusbar("Failed to apply Auto Test config"); } *************** *** 221,225 **** if (error != NULL) { ! winError((const char *) error); set_item_statusbar("SNMP set error"); free(error); --- 221,225 ---- if (error != NULL) { ! userwin( USERWIN_ERROR, (const char *) error); set_item_statusbar("SNMP set error"); free(error); *************** *** 273,277 **** if (error == NULL) { ! winError((const char *) error); set_item_statusbar("AP set error"); } --- 273,277 ---- if (error == NULL) { ! userwin(USERWIN_ERROR, (const char *) error); set_item_statusbar("AP set error"); } *************** *** 683,690 **** if (error != NULL) { ! winError((const char *) error); set_item_statusbar("TC Power set error"); } ! syscmdfree(error); /* È¿¼®¾Æ .. Á¦¹ß howto ´ë·Î ¿¡¿Üó¸®ÇØÁà -_-;; */ } --- 683,690 ---- if (error != NULL) { ! userwin( USERWIN_ERROR, (const char *) error); set_item_statusbar("TC Power set error"); } ! syscmdfree(error); } *************** *** 767,771 **** close_winError(GtkWidget * widget, GtkWidget * win) { - openError = 0; gtk_widget_hide(win); --- 767,770 ---- Index: apc.c =================================================================== RCS file: /cvsroot/netadm/gwc/gwcguid/apc.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** apc.c 30 Jan 2006 17:41:29 -0000 1.1.1.1 --- apc.c 31 Jan 2006 14:51:58 -0000 1.2 *************** *** 85,89 **** if (row == -1) { ! winError(list[0]); return -1; } --- 85,89 ---- if (row == -1) { ! userwin(USERWIN_ERROR, list[0]); return -1; } *************** *** 113,117 **** if (row == -1) { ! winError(list[0]); return -1; } --- 113,117 ---- if (row == -1) { ! userwin( USERWIN_ERROR, list[0]); return -1; } *************** *** 218,222 **** if (row == -1) { ! winError(list[0]); return -1; } --- 218,222 ---- if (row == -1) { ! userwin( USERWIN_ERROR, list[0]); return -1; } *************** *** 288,292 **** if (row == -1) { ! winError(list[0]); return -1; } --- 288,292 ---- if (row == -1) { ! userwin( USERWIN_ERROR, list[0]); return -1; } *************** *** 321,325 **** if (row == -1) { ! winError(list[0]); return -1; } --- 321,325 ---- if (row == -1) { ! userwin( USERWIN_ERROR, list[0]); return -1; } *************** *** 388,392 **** if (row == -1) { ! winError(list[0]); return -1; } --- 388,392 ---- if (row == -1) { ! userwin( USERWIN_ERROR, list[0]); return -1; } *************** *** 430,434 **** if (row == -1) { ! winError(list[0]); return -1; } --- 430,434 ---- if (row == -1) { ! userwin( USERWIN_ERROR, list[0]); return -1; } *************** *** 442,446 **** if (row == -1) { ! winError(list[0]); return -1; } --- 442,446 ---- if (row == -1) { ! userwin( USERWIN_ERROR, list[0]); return -1; } *************** *** 453,457 **** if (row == -1) { ! winError(list[0]); return -1; } --- 453,457 ---- if (row == -1) { ! userwin( USERWIN_ERROR, list[0]); return -1; } Index: interface.h =================================================================== RCS file: /cvsroot/netadm/gwc/gwcguid/interface.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** interface.h 30 Jan 2006 17:41:28 -0000 1.1.1.1 --- interface.h 31 Jan 2006 14:51:58 -0000 1.2 *************** *** 21,24 **** --- 21,27 ---- g_object_set_data (G_OBJECT (component), name, widget) + #define USERWIN_INFO 0X00000000 + #define USERWIN_ERROR 0X00000001 + GtkWidget *create_window1(void); GtkWidget *create_window2(int count); *************** *** 32,36 **** GtkWidget *create_window12(void); GtkWidget *create_window13(void); ! GtkWidget *winError(const char *strError); GtkWidget *create_windowErrAdd(void); GtkWidget *create_windowBandAdd(int result); --- 35,39 ---- GtkWidget *create_window12(void); GtkWidget *create_window13(void); ! GtkWidget *userwin(int flag, const char *strError); GtkWidget *create_windowErrAdd(void); GtkWidget *create_windowBandAdd(int result); Index: qos.c =================================================================== RCS file: /cvsroot/netadm/gwc/gwcguid/qos.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** qos.c 30 Jan 2006 17:41:29 -0000 1.1.1.1 --- qos.c 31 Jan 2006 14:51:58 -0000 1.2 *************** *** 127,131 **** if (error != NULL) { ! winError(error); set_item_statusbar("TC Apply Error"); } --- 127,131 ---- if (error != NULL) { ! userwin(USERWIN_ERROR,error); set_item_statusbar("TC Apply Error"); } *************** *** 345,349 **** if (row == -1) { ! winError(list[0]); set_item_statusbar("get interface error"); return -1; --- 345,349 ---- if (row == -1) { ! userwin(USERWIN_ERROR,list[0]); set_item_statusbar("get interface error"); return -1; *************** *** 369,373 **** if (row == -1) { ! winError(list[0]); set_item_statusbar("CMD_LIST_TC_MAXBW error"); return -1; --- 369,373 ---- if (row == -1) { ! userwin(USERWIN_ERROR,list[0]); set_item_statusbar("CMD_LIST_TC_MAXBW error"); return -1; *************** *** 394,398 **** if (row == -1) { ! winError(list[0]); set_item_statusbar("get band list Apply Error"); return -1; --- 394,398 ---- if (row == -1) { ! userwin(USERWIN_ERROR,list[0]); set_item_statusbar("get band list Apply Error"); return -1; *************** *** 421,425 **** if (row == -1) { ! winError(list[0]); set_item_statusbar("get class list Apply Error"); return -1; --- 421,425 ---- if (row == -1) { ! userwin(USERWIN_ERROR,list[0]); set_item_statusbar("get class list Apply Error"); return -1; *************** *** 449,453 **** if (row == -1) { ! winError(list[0]); set_item_statusbar("get filter list Apply Error"); return -1; --- 449,453 ---- if (row == -1) { ! userwin(USERWIN_ERROR,list[0]); set_item_statusbar("get filter list Apply Error"); return -1; *************** *** 478,482 **** if (row == -1) { ! winError(list[0]); set_item_statusbar("get policy list Apply Error"); return -1; --- 478,482 ---- if (row == -1) { ! userwin(USERWIN_ERROR,list[0]); set_item_statusbar("get policy list Apply Error"); return -1; *************** *** 685,689 **** if (error != NULL) { ! winError(error); set_item_statusbar("CMD_ADD_TC_MAXBW Error"); return; --- 685,689 ---- if (error != NULL) { ! userwin(USERWIN_ERROR,error); set_item_statusbar("CMD_ADD_TC_MAXBW Error"); return; *************** *** 738,742 **** if (error != NULL) { ! winError(error); set_item_statusbar("TC Apply Error"); return; --- 738,742 ---- if (error != NULL) { ! userwin(USERWIN_ERROR,error); set_item_statusbar("TC Apply Error"); return; *************** *** 815,819 **** if (error != NULL) { ! winError(error); set_item_statusbar("TC Apply Error"); return; --- 815,819 ---- if (error != NULL) { ! userwin(USERWIN_ERROR,error); set_item_statusbar("TC Apply Error"); return; *************** *** 915,919 **** if (error != NULL) { ! winError(error); set_item_statusbar("POLICY set Error"); return; --- 915,919 ---- if (error != NULL) { ! userwin(USERWIN_ERROR,error); set_item_statusbar("POLICY set Error"); return; *************** *** 936,940 **** if (error != NULL) { ! winError(error); } --- 936,940 ---- if (error != NULL) { ! userwin(USERWIN_ERROR,error); } *************** *** 955,959 **** if (error != NULL) { ! winError(error); } --- 955,959 ---- if (error != NULL) { ! userwin(USERWIN_ERROR,error); } *************** *** 974,978 **** if (error != NULL) { ! winError(error); } syscmdfree(error); --- 974,978 ---- if (error != NULL) { ! userwin(USERWIN_ERROR,error); } syscmdfree(error); *************** *** 992,996 **** if (error != NULL) { ! winError(error); } syscmdfree(error); --- 992,996 ---- if (error != NULL) { ! userwin(USERWIN_ERROR,error); } syscmdfree(error); Index: fwc.c =================================================================== RCS file: /cvsroot/netadm/gwc/gwcguid/fwc.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** fwc.c 30 Jan 2006 17:41:29 -0000 1.1.1.1 --- fwc.c 31 Jan 2006 14:51:58 -0000 1.2 *************** *** 121,125 **** if (row == -1) { ! winError(list[0]); set_item_statusbar("get host policy list Error"); return -1; --- 121,125 ---- if (row == -1) { ! userwin( USERWIN_ERROR, list[0]); set_item_statusbar("get host policy list Error"); return -1; *************** *** 173,177 **** if (error != NULL) { ! winError(error); set_item_statusbar("add Hostpol Error"); return; --- 173,177 ---- if (error != NULL) { ! userwin( USERWIN_ERROR, error); set_item_statusbar("add Hostpol Error"); return; *************** *** 197,201 **** if (error != NULL) { ! winError(error); set_item_statusbar("delete Hostpol Error"); return; --- 197,201 ---- if (error != NULL) { ! userwin( USERWIN_ERROR, error); set_item_statusbar("delete Hostpol Error"); return; *************** *** 216,220 **** if (error != NULL) { ! winError(error); set_item_statusbar("apply Hostpol Error"); return; --- 216,220 ---- if (error != NULL) { ! userwin( USERWIN_ERROR, error); set_item_statusbar("apply Hostpol Error"); return; Index: interface.c =================================================================== RCS file: /cvsroot/netadm/gwc/gwcguid/interface.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** interface.c 31 Jan 2006 14:19:38 -0000 1.2 --- interface.c 31 Jan 2006 14:51:58 -0000 1.3 *************** *** 4639,4643 **** GtkWidget * ! winError(const char *strError) { if (openError == 1) --- 4639,4643 ---- GtkWidget * ! userwin(int flag, const char *str) { if (openError == 1) *************** *** 4687,4691 **** gtk_alignment_set_padding(GTK_ALIGNMENT(alignment316), 5, 5, 5, 5); ! label_err = gtk_label_new(strError); gtk_widget_show(label_err); gtk_container_add(GTK_CONTAINER(alignment316), label_err); --- 4687,4691 ---- gtk_alignment_set_padding(GTK_ALIGNMENT(alignment316), 5, 5, 5, 5); ! label_err = gtk_label_new(str); gtk_widget_show(label_err); gtk_container_add(GTK_CONTAINER(alignment316), label_err); |
