gqclient-commit Mailing List for GQ LDAP client (Page 9)
Status: Beta
Brought to you by:
sur5r
Menu
▾
▴
gqclient-commit — CVS commits
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
(4) |
May
|
Jun
(14) |
Jul
(38) |
Aug
(5) |
Sep
(29) |
Oct
(30) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(30) |
Oct
(217) |
Nov
(24) |
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
(53) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sta...@us...> - 2003-10-11 09:14:11
|
Update of /cvsroot/gqclient/gq/src
In directory sc8-pr-cvs1:/tmp/cvs-serv23172
Modified Files:
schema.c
Log Message:
* Got rid of yet another fixed-size buffer (problematic with UTF-8)
Index: schema.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/schema.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** schema.c 8 Oct 2003 22:01:12 -0000 1.19
--- schema.c 11 Oct 2003 09:14:07 -0000 1.20
***************
*** 97,101 ****
char *attr, **vals;
const char *errp;
! char subschema[100];
char *subschemasubentry[] = { "subschemaSubentry",
NULL };
--- 97,101 ----
char *attr, **vals;
const char *errp;
! char *subschema = NULL;
char *subschemasubentry[] = { "subschemaSubentry",
NULL };
***************
*** 114,118 ****
ss = NULL;
- subschema[0] = 0;
server->flags |= SERVER_HAS_NO_SCHEMA;
statusbar_msg(_("subschemaSubentry search on root DSE"));
--- 114,117 ----
***************
*** 138,144 ****
if( (attr = ldap_first_attribute(ld, res, &berptr)) ) {
if( (vals = ldap_get_values(ld, res, attr)) ) {
! if(strlen(vals[0]) < sizeof(subschema) - 1) {
! strcpy(subschema, vals[0]); /* Flawfinder: ignore */
! }
ldap_value_free(vals);
}
--- 137,141 ----
if( (attr = ldap_first_attribute(ld, res, &berptr)) ) {
if( (vals = ldap_get_values(ld, res, attr)) ) {
! subschema = g_strdup(vals[0]);
ldap_value_free(vals);
}
***************
*** 152,156 ****
ldap_msgfree(res);
! if(subschema[0] == 0) {
statusbar_msg("%s", _("no schema information found"));
close_connection(server, FALSE);
--- 149,153 ----
ldap_msgfree(res);
! if(subschema == NULL) {
statusbar_msg("%s", _("no schema information found"));
close_connection(server, FALSE);
***************
*** 162,165 ****
--- 159,164 ----
msg = ldap_search_s(ld, subschema, LDAP_SCOPE_BASE,
"(objectclass=*)", schema_attrs, 0, &res);
+
+ g_free_if(subschema);
if(msg != LDAP_SUCCESS) {
|
|
From: <bi...@us...> - 2003-10-11 08:55:35
|
Update of /cvsroot/gqclient/gq
In directory sc8-pr-cvs1:/tmp/cvs-serv16909
Modified Files:
TODO
Log Message:
mark schemabrowse refresh bug as fixed
Index: TODO
===================================================================
RCS file: /cvsroot/gqclient/gq/TODO,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** TODO 11 Oct 2003 06:41:53 -0000 1.36
--- TODO 11 Oct 2003 08:55:31 -0000 1.37
***************
*** 14,19 ****
1.0 it will be marked as BROKEN in the GUI
- * [1.0] schemabrowse mode: context menu on server, refresh option segfaults
-
* [1.0] schemabrowse mode: items require a double-click to be selected, not
a single click as usual
--- 14,17 ----
***************
*** 139,142 ****
--- 137,142 ----
FIXED BUGS / IMPLEMENTED ENHANCEMENTS
-------------------------------------
+
+ * [1.0] schemabrowse mode: context menu on server, refresh option segfaults
* [1.0] search mode: double-click to select/edit an entry doesn't work
|
|
From: <sta...@us...> - 2003-10-11 07:07:44
|
Update of /cvsroot/gqclient/gq/src
In directory sc8-pr-cvs1:/tmp/cvs-serv1999
Modified Files:
dt_password.c
Log Message:
* Got rid of old commented-out code while checking for strcpy
occurrences all over the place
Index: dt_password.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/dt_password.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** dt_password.c 2 Oct 2003 16:16:25 -0000 1.15
--- dt_password.c 11 Oct 2003 07:07:40 -0000 1.16
***************
*** 124,129 ****
unsigned char *password, rand[16], cryptbuf[32];
- /* gb = g_byte_array_set_size(gb, 64); */
-
password = (char*) g_malloc((len + 1) * sizeof(char));
memcpy(password, data, len);
--- 124,127 ----
***************
*** 139,146 ****
g_byte_array_append(gb, "{CRYPT}", 7);
-
- /* strcpy(gb->data, "{crypt}"); */
des_fcrypt(password, salt->str, cryptbuf);
! /* gb->data + strlen(gb->data)); */
g_byte_array_append(gb, cryptbuf, strlen(cryptbuf));
--- 137,142 ----
g_byte_array_append(gb, "{CRYPT}", 7);
des_fcrypt(password, salt->str, cryptbuf);
!
g_byte_array_append(gb, cryptbuf, strlen(cryptbuf));
***************
*** 164,174 ****
g_byte_array_append(gb, b64->str, strlen(b64->str));
- /* gb = g_byte_array_set_size(gb, MD5_DIGEST_LENGTH + 10); */
-
- /* strcpy(gb->data, "{MD5}"); */
- /* strcat(gb->data, b64->str); */
-
- /* g_byte_array_set_size(gb, strlen(gb->data)); */
-
g_string_free(b64, TRUE);
--- 160,163 ----
***************
*** 186,195 ****
b64_encode(b64, sha_out, SHA_DIGEST_LENGTH);
- /* gb = g_byte_array_set_size(gb, SHA_DIGEST_LENGTH + 10); */
-
- /* strcpy(gb->data, "{SHA}"); */
- /* strcat(gb->data, b64->str); */
-
- /* g_byte_array_set_size(gb, strlen(gb->data)); */
g_byte_array_append(gb, "{SHA}", 5);
g_byte_array_append(gb, b64->str, strlen(b64->str));
--- 175,178 ----
***************
*** 220,230 ****
b64_encode(b64, sha_out, sizeof(sha_out));
- /* gb = g_byte_array_set_size(gb, SHA_DIGEST_LENGTH + 16); */
-
- /* strcpy(gb->data, "{SSHA}"); */
- /* strcat(gb->data, b64->str); */
-
- /* g_byte_array_set_size(gb, strlen(gb->data)); */
-
g_byte_array_append(gb, "{SSHA}", 6);
g_byte_array_append(gb, b64->str, strlen(b64->str));
--- 203,206 ----
***************
*** 254,263 ****
b64_encode(b64, md5_out, sizeof(md5_out));
- /* gb = g_byte_array_set_size(gb, MD5_DIGEST_LENGTH + 16); */
-
- /* strcpy(gb->data, "{SMD5}"); */
- /* strcat(gb->data, b64->str); */
-
- /* g_byte_array_set_size(gb, strlen(gb->data)); */
g_byte_array_append(gb, "{SMD5}", 6);
g_byte_array_append(gb, b64->str, strlen(b64->str));
--- 230,233 ----
***************
*** 458,467 ****
g_free(crypt_type);
}
-
- /* printf("getting orgtext '%s' text '%s' orglen=%d len1=%d len2=%d\n", */
- /* content, */
- /* copy->data, */
- /* strlen(content), */
- /* copy->len, strlen(copy->data)); */
return data;
--- 428,431 ----
|
|
From: <sta...@us...> - 2003-10-11 06:43:03
|
Update of /cvsroot/gqclient/gq In directory sc8-pr-cvs1:/tmp/cvs-serv31924 Modified Files: configure.in Log Message: * Fixed problem when both libxml 1 and 2 are available. Reported by Marc Britten <yu...@mo...>. Index: configure.in =================================================================== RCS file: /cvsroot/gqclient/gq/configure.in,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** configure.in 10 Oct 2003 07:13:12 -0000 1.49 --- configure.in 11 Oct 2003 06:42:59 -0000 1.50 *************** *** 191,194 **** --- 191,195 ---- + XML_OK= AC_CHECK_LIB(xml2, xmlCreateIOParserCtxt, *************** *** 198,206 **** LIBS="$LIBS $XML_LIBS" CFLAGS="$CFLAGS $XML_CFLAGS" ]) AC_CHECK_LIB(xml, xmlSAXUserParseFile, [AC_DEFINE(HAVE_LIBXML,,[Define if libxml is available on your system]) ! LIBS="-lxml $LIBS"]) DEBUG=1 --- 199,213 ---- LIBS="$LIBS $XML_LIBS" CFLAGS="$CFLAGS $XML_CFLAGS" + XML_OK=1 ]) AC_CHECK_LIB(xml, xmlSAXUserParseFile, [AC_DEFINE(HAVE_LIBXML,,[Define if libxml is available on your system]) ! ! if test "x$XML_OK" = "x" ; then ! LIBS="-lxml $LIBS" ! XML_OK=1 ! fi ! ]) DEBUG=1 |
|
From: <sta...@us...> - 2003-10-11 06:41:56
|
Update of /cvsroot/gqclient/gq
In directory sc8-pr-cvs1:/tmp/cvs-serv31839
Modified Files:
TODO
Log Message:
* Moved some search-mode TODOs to the "done" section
Index: TODO
===================================================================
RCS file: /cvsroot/gqclient/gq/TODO,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** TODO 10 Oct 2003 21:49:44 -0000 1.35
--- TODO 11 Oct 2003 06:41:53 -0000 1.36
***************
*** 19,26 ****
a single click as usual
- * [1.0] search mode: double-click to select/edit an entry doesn't work
-
- * [1.0] search mode: "find in browser" and "add all to browser" segfault
-
* update schemabrowse tree on serverlist update (browsetree already done)
--- 19,22 ----
***************
*** 143,146 ****
--- 139,150 ----
FIXED BUGS / IMPLEMENTED ENHANCEMENTS
-------------------------------------
+
+ * [1.0] search mode: double-click to select/edit an entry doesn't work
+ Cause: Signal handling in GTK2 has changed. The button press signal
+ handler returned TRUE unconidtionally, signalling to gtk that the
+ signal was handled even when it was not button 3.
+
+ * [1.0] search mode: "find in browser" and "add all to browser" segfault
+ - but only if no browse mode tab has been shown previously - fixed
* [1.0] Switch to a proper XML parser for configuration file
|
|
From: <sta...@us...> - 2003-10-11 06:40:51
|
Update of /cvsroot/gqclient/gq/src
In directory sc8-pr-cvs1:/tmp/cvs-serv31709
Modified Files:
input.c search.c search.h
Log Message:
* Fixed several search related bug reported by Bert through TODO
* Made search mode UTF-8 clean and memory management safe wrt to
clist column handling
* Assure that the result columns can be resized in search mode
Index: input.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/input.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** input.c 10 Oct 2003 06:58:59 -0000 1.64
--- input.c 11 Oct 2003 06:40:44 -0000 1.65
***************
*** 105,108 ****
--- 105,119 ----
}
+ GdkWindow *get_any_gdk_window(GtkWidget *w)
+ {
+ while (w) {
+ if (GTK_WIDGET(w)->window) {
+ return GTK_WIDGET(w)->window;
+ }
+ w = GTK_WIDGET(w)->parent;
+ }
+ g_error("No GDK window in widget hierarchy");
+ return NULL;
+ }
void create_form_content(struct inputform *iform)
***************
*** 128,132 ****
linebutton = gtk_button_new();
GTK_WIDGET_UNSET_FLAGS(linebutton, GTK_CAN_FOCUS);
! icon = gdk_pixmap_create_from_xpm_d(GTK_WIDGET(iform->target_vbox)->window,
&icon_mask,
&iform->target_vbox->style->white,
--- 139,143 ----
linebutton = gtk_button_new();
GTK_WIDGET_UNSET_FLAGS(linebutton, GTK_CAN_FOCUS);
! icon = gdk_pixmap_create_from_xpm_d(get_any_gdk_window(iform->target_vbox),
&icon_mask,
&iform->target_vbox->style->white,
***************
*** 159,163 ****
textareabutton = gtk_button_new();
GTK_WIDGET_UNSET_FLAGS(textareabutton, GTK_CAN_FOCUS);
! icon = gdk_pixmap_create_from_xpm_d(GTK_WIDGET(iform->target_vbox)->window,
&icon_mask,
&iform->target_vbox->style->white,
--- 170,174 ----
textareabutton = gtk_button_new();
GTK_WIDGET_UNSET_FLAGS(textareabutton, GTK_CAN_FOCUS);
! icon = gdk_pixmap_create_from_xpm_d(get_any_gdk_window(iform->target_vbox),
&icon_mask,
&iform->target_vbox->style->white,
***************
*** 186,190 ****
GTK_WIDGET_UNSET_FLAGS(newattrbutton, GTK_CAN_FOCUS);
! icon = gdk_pixmap_create_from_xpm_d(GTK_WIDGET(iform->target_vbox)->window,
&icon_mask,
&iform->target_vbox->style->white,
--- 197,201 ----
GTK_WIDGET_UNSET_FLAGS(newattrbutton, GTK_CAN_FOCUS);
! icon = gdk_pixmap_create_from_xpm_d(get_any_gdk_window(iform->target_vbox),
&icon_mask,
&iform->target_vbox->style->white,
***************
*** 213,217 ****
hideattrbutton = gtk_toggle_button_new();
GTK_WIDGET_UNSET_FLAGS(hideattrbutton, GTK_CAN_FOCUS);
! icon = gdk_pixmap_create_from_xpm_d(GTK_WIDGET(iform->target_vbox)->window,
&icon_mask,
&iform->target_vbox->style->white,
--- 224,228 ----
hideattrbutton = gtk_toggle_button_new();
GTK_WIDGET_UNSET_FLAGS(hideattrbutton, GTK_CAN_FOCUS);
! icon = gdk_pixmap_create_from_xpm_d(get_any_gdk_window(iform->target_vbox),
&icon_mask,
&iform->target_vbox->style->white,
Index: search.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/search.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** search.c 10 Oct 2003 06:58:59 -0000 1.43
--- search.c 11 Oct 2003 06:40:44 -0000 1.44
***************
*** 256,260 ****
newset->num_attributes = 0;
newset->next = NULL;
!
if(SEARCHTAB(tab)->cur_resultset == NULL) {
SEARCHTAB(tab)->cur_resultset = newset;
--- 256,261 ----
newset->num_attributes = 0;
newset->next = NULL;
! newset->dn = g_strdup("");
!
if(SEARCHTAB(tab)->cur_resultset == NULL) {
SEARCHTAB(tab)->cur_resultset = newset;
***************
*** 276,279 ****
--- 277,281 ----
while(set) {
nextset = set->next;
+ g_free_if(set->dn);
g_free(set);
set = nextset;
***************
*** 425,430 ****
struct resultset *set, *cur_resultset;
struct attrs *attrlist;
! gchar *cur_servername, *cur_searchbase, *enc_searchbase, *querystring, *cl[MAX_NUM_ATTRIBUTES];
! char tolist[MAX_NUM_ATTRIBUTES][128];
char *filter, *attr, *dn, **vals, *searchterm;
int msg, rc, i, row;
--- 427,433 ----
struct resultset *set, *cur_resultset;
struct attrs *attrlist;
! gchar *cur_servername, *cur_searchbase, *enc_searchbase, *querystring;
! GString *tolist[MAX_NUM_ATTRIBUTES];
! gchar *cl[MAX_NUM_ATTRIBUTES];
char *filter, *attr, *dn, **vals, *searchterm;
int msg, rc, i, row;
***************
*** 507,512 ****
--- 510,518 ----
/* build new clist */
new_main_clist = gtk_clist_new(MAX_NUM_ATTRIBUTES);
+
GTK_CLIST(new_main_clist)->button_actions[2] = GTK_BUTTON_SELECTS;
+ #ifdef OLD_FOCUS_HANDLING
GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(new_main_clist), GTK_CAN_FOCUS);
+ #endif
gtk_widget_show(new_main_clist);
gtk_clist_column_titles_show(GTK_CLIST(new_main_clist));
***************
*** 550,553 ****
--- 556,563 ----
rc = (ldap_sort_entries(ld, &res, NULL, strcasecmp) == LDAP_SUCCESS);
+ for(i = 0; i < MAX_NUM_ATTRIBUTES; i++) {
+ tolist[i] = g_string_sized_new(MAX_DN_LEN);
+ }
+
while(rc) {
for(e = ldap_first_entry(ld, res); e != NULL;
***************
*** 558,562 ****
for(i = 0; i < MAX_NUM_ATTRIBUTES; i++) {
cl[i] = NULL;
! tolist[i][0] = '\0';
}
--- 568,572 ----
for(i = 0; i < MAX_NUM_ATTRIBUTES; i++) {
cl[i] = NULL;
! g_string_truncate(tolist[i], 0);
}
***************
*** 564,578 ****
/* store for later reference */
set = new_resultset(tab);
! strncpy(set->dn, dn, MAX_DN_LEN);
if(config->showdn) {
#if GTK_MAJOR >= 2
! strcpy(tolist[0], dn);
#else
decoded_value = decoded_string(dn);
! strcpy(tolist[0], decoded_value);
free(decoded_value);
#endif
! cl[0] = tolist[0];
}
#if defined(HAVE_LDAP_MEMFREE)
--- 574,589 ----
/* store for later reference */
set = new_resultset(tab);
!
! g_free_and_dup(set->dn, dn);
if(config->showdn) {
#if GTK_MAJOR >= 2
! g_string_append(tolist[0], dn);
#else
decoded_value = decoded_string(dn);
! g_string_append(tolist[0], decoded_value);
free(decoded_value);
#endif
! cl[0] = tolist[0]->str;
}
#if defined(HAVE_LDAP_MEMFREE)
***************
*** 602,605 ****
--- 613,617 ----
if (c) g_free(c);
gtk_clist_set_column_width(GTK_CLIST(new_main_clist), cur_col, 120);
+ gtk_clist_set_column_resizeable(GTK_CLIST(new_main_clist), cur_col, TRUE);
columns_done[cur_col] = 1;
}
***************
*** 609,625 ****
for(i = 0; vals[i] != NULL; i++) {
#if GTK_MAJOR >= 2
! if(i == 0)
! strcpy(tolist[cur_col], vals[i]);
! else {
! strcat(tolist[cur_col], " ");
! strcat(tolist[cur_col], vals[i]);
}
#else
decoded_value = decoded_string(vals[i]);
if(i == 0)
! strcpy(tolist[cur_col], decoded_value);
else {
! strcat(tolist[cur_col], " ");
! strcat(tolist[cur_col], decoded_value);
}
free(decoded_value);
--- 621,637 ----
for(i = 0; vals[i] != NULL; i++) {
#if GTK_MAJOR >= 2
! if(i == 0) {
! g_string_assign(tolist[cur_col], vals[i]);
! } else {
! g_string_append(tolist[cur_col], " ");
! g_string_append(tolist[cur_col], vals[i]);
}
#else
decoded_value = decoded_string(vals[i]);
if(i == 0)
! g_string_assign(tolist[cur_col], decoded_value);
else {
! g_string_append(tolist[cur_col], " ");
! g_string_append(tolist[cur_col], decoded_value);
}
free(decoded_value);
***************
*** 627,631 ****
}
ldap_value_free(vals);
! cl[cur_col] = tolist[cur_col];
}
ldap_memfree(attr);
--- 639,651 ----
}
ldap_value_free(vals);
! #if GTK_MAJOR >= 2
! if (g_utf8_validate(tolist[cur_col]->str, -1, NULL)) {
! cl[cur_col] = tolist[cur_col]->str;
! } else {
! cl[cur_col] = "";
! }
! #else
! cl[cur_col] = tolist[cur_col]->str;
! #endif
}
ldap_memfree(attr);
***************
*** 655,658 ****
--- 675,682 ----
}
+ for(i = 0; i < MAX_NUM_ATTRIBUTES; i++) {
+ g_string_free(tolist[i], TRUE);
+ }
+
if(rc == -1)
statusbar_msg("%s", ldap_err2string(msg));
***************
*** 936,940 ****
}
! return TRUE;
}
--- 960,968 ----
}
! #if GTK_MAJOR >= 2
! return FALSE;
! #else
! return TRUE; /* may be a bug to return TRUE unconditionally in gtk 1.2 */
! #endif
}
Index: search.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/search.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** search.h 4 Oct 2003 00:58:44 -0000 1.9
--- search.h 11 Oct 2003 06:40:44 -0000 1.10
***************
*** 43,47 ****
struct resultset {
! char dn[MAX_DN_LEN];
struct oc *objectclass;
struct attrs *attributes;
--- 43,47 ----
struct resultset {
! char *dn;
struct oc *objectclass;
struct attrs *attributes;
|
|
From: <bi...@us...> - 2003-10-11 00:18:08
|
Update of /cvsroot/gqclient/gq/src
In directory sc8-pr-cvs1:/tmp/cvs-serv12712/src
Modified Files:
schemabrowse.c
Log Message:
fixed segfault when refreshing server in schemabrowse tree
fixed segfault when selecting an item in a tree that had been refreshed
Index: schemabrowse.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/schemabrowse.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** schemabrowse.c 10 Oct 2003 06:58:59 -0000 1.20
--- schemabrowse.c 11 Oct 2003 00:18:04 -0000 1.21
***************
*** 135,138 ****
--- 135,139 ----
gtk_signal_connect(GTK_OBJECT(new_item), "button_press_event",
GTK_SIGNAL_FUNC(schema_button_tree), NULL);
+ gtk_object_set_data(GTK_OBJECT(new_item), "tab", tab);
gtk_object_set_data(GTK_OBJECT(new_item), "server",
(gpointer) server);
***************
*** 367,370 ****
--- 368,372 ----
GtkWidget *new_subtree;
struct ldapserver *server;
+ struct tab *tab;
if( (server = gtk_object_get_data(GTK_OBJECT(item), "server")) == NULL)
***************
*** 377,381 ****
--- 379,387 ----
/* this is a workaround -- lots of GTK warnings if I don't do this :-( */
+ #if GTK_MAJOR < 2
sel = GTK_TREE_SELECTION(tree);
+ #else
+ sel = GTK_TREE_SELECTION_OLD(tree);
+ #endif
while(sel) {
if(sel->data)
***************
*** 388,393 ****
new_subtree = gtk_tree_new();
gtk_tree_item_set_subtree(GTK_TREE_ITEM(item), new_subtree);
gtk_signal_connect(GTK_OBJECT(item), "expand",
! GTK_SIGNAL_FUNC(attach_server_schema), NULL);
}
}
--- 394,400 ----
new_subtree = gtk_tree_new();
gtk_tree_item_set_subtree(GTK_TREE_ITEM(item), new_subtree);
+ tab = gtk_object_get_data(GTK_OBJECT(item), "tab");
gtk_signal_connect(GTK_OBJECT(item), "expand",
! GTK_SIGNAL_FUNC(attach_server_schema), tab);
}
}
|
|
From: <bi...@us...> - 2003-10-10 21:49:50
|
Update of /cvsroot/gqclient/gq
In directory sc8-pr-cvs1:/tmp/cvs-serv20441
Modified Files:
TODO
Log Message:
more bugs to fix before 1.0
Index: TODO
===================================================================
RCS file: /cvsroot/gqclient/gq/TODO,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** TODO 10 Oct 2003 06:44:00 -0000 1.34
--- TODO 10 Oct 2003 21:49:44 -0000 1.35
***************
*** 14,17 ****
--- 14,26 ----
1.0 it will be marked as BROKEN in the GUI
+ * [1.0] schemabrowse mode: context menu on server, refresh option segfaults
+
+ * [1.0] schemabrowse mode: items require a double-click to be selected, not
+ a single click as usual
+
+ * [1.0] search mode: double-click to select/edit an entry doesn't work
+
+ * [1.0] search mode: "find in browser" and "add all to browser" segfault
+
* update schemabrowse tree on serverlist update (browsetree already done)
|
|
From: <sta...@us...> - 2003-10-10 08:22:30
|
Update of /cvsroot/gqclient/gq/po
In directory sc8-pr-cvs1:/tmp/cvs-serv23384
Modified Files:
cs.po de.po ja.po zh_CN.po
Log Message:
* Changes due to make update-po and make dist for 1.0alpha2
Index: cs.po
===================================================================
RCS file: /cvsroot/gqclient/gq/po/cs.po,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** cs.po 9 Oct 2003 05:54:24 -0000 1.6
--- cs.po 10 Oct 2003 08:22:25 -0000 1.7
***************
*** 6,10 ****
msgstr ""
"Project-Id-Version: gq 0.6.0\n"
! "POT-Creation-Date: 2003-10-06 20:24+0200\n"
"PO-Revision-Date: 2002-10-09 14:40+0200\n"
"Last-Translator: Tomas Dobrovolny <tom...@at...>\n"
--- 6,10 ----
msgstr ""
"Project-Id-Version: gq 0.6.0\n"
! "POT-Creation-Date: 2003-10-10 09:03+0200\n"
"PO-Revision-Date: 2002-10-09 14:40+0200\n"
"Last-Translator: Tomas Dobrovolny <tom...@at...>\n"
***************
*** 297,302 ****
msgstr "Zapamatovat si server a základní DN"
! #. gtk_container_border_width(GTK_CONTAINER(hbox_buttons), 10);
! msgid "OK"
msgstr "OK"
--- 297,302 ----
msgstr "Zapamatovat si server a základní DN"
! #, fuzzy
! msgid "_OK"
msgstr "OK"
***************
*** 313,322 ****
msgstr "Filtry"
- #. New button
#, fuzzy
msgid "_New"
msgstr "Nový"
- #. Delete button
#, fuzzy
msgid "_Delete"
--- 313,320 ----
***************
*** 348,363 ****
msgstr "Ulo¾it"
! #. PSt: Removed again, as the GUI is too confusing. What
! #. does "OK" mean wrt "Apply"? Which Button does which? It
! #. is not intuitive enough too keep this. AND it still has a
! #. problem after Apply: The current DN does not get
! #. changed.
! #. button = gtk_button_new_with_label(_("Apply"));
! #. gtk_widget_show(button);
! #. gtk_box_pack_start(GTK_BOX(hbox2), button, FALSE, FALSE, 0);
! #. gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
! #. GTK_SIGNAL_FUNC(add_entry_from_formlist_no_close),
! #. (gpointer) iform);
! msgid "Cancel"
msgstr "Zru¹it"
--- 346,351 ----
msgstr "Ulo¾it"
! #, fuzzy
! msgid "_Cancel"
msgstr "Zru¹it"
***************
*** 427,431 ****
msgstr "Obrnovit"
! msgid "Close"
msgstr "Zavøít"
--- 415,420 ----
msgstr "Obrnovit"
! #, fuzzy
! msgid "_Close"
msgstr "Zavøít"
***************
*** 766,770 ****
#. Use local cache
#, fuzzy
! msgid "LDAP cache time_out"
msgstr "èasový limit vyrovnávací pamìti LDAP vypr¹el"
--- 755,759 ----
#. Use local cache
#, fuzzy
! msgid "LDAP cache timeo_ut"
msgstr "èasový limit vyrovnávací pamìti LDAP vypr¹el"
***************
*** 804,808 ****
#. Cache connections
! msgid "_Cache connection"
msgstr ""
--- 793,797 ----
#. Cache connections
! msgid "Cach_e connection"
msgstr ""
***************
*** 936,940 ****
#. Format frame
! msgid " Format "
msgstr "Formát"
--- 925,930 ----
#. Format frame
! #, fuzzy
! msgid "Format"
msgstr "Formát"
***************
*** 955,964 ****
--- 945,969 ----
msgstr ""
+ msgid ""
+ "Turn on if the sizes of some windows should be saved and restored across "
+ "program invocations."
+ msgstr ""
+
#. Restore Window Positions checkbox
msgid "Restore Window Pos_itions"
msgstr ""
+ msgid ""
+ "If turned on, the program will try to save and restore the on-screen "
+ "position of some windows across program invocations. This will not work with "
+ "certain window managers."
+ msgstr ""
+
#. Restore Search History checkbox
msgid "Restore Search _History"
+ msgstr ""
+
+ msgid ""
+ "If set then save and restore the search history across program invocations."
msgstr ""
Index: de.po
===================================================================
RCS file: /cvsroot/gqclient/gq/po/de.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** de.po 10 Oct 2003 07:11:47 -0000 1.20
--- de.po 10 Oct 2003 08:22:25 -0000 1.21
***************
*** 912,916 ****
"Turn on if the sizes of some windows should be saved and restored across "
"program invocations."
! msgstr "Aktivieren zur automatischen Wiederherstellung der Fenstergrößen verschiedener Fenster auch über Programmneustarts hinweg."
#. Restore Window Positions checkbox
--- 912,918 ----
"Turn on if the sizes of some windows should be saved and restored across "
"program invocations."
! msgstr ""
! "Aktivieren zur automatischen Wiederherstellung der Fenstergrößen "
! "verschiedener Fenster auch über Programmneustarts hinweg."
#. Restore Window Positions checkbox
***************
*** 922,926 ****
"position of some windows across program invocations. This will not work with "
"certain window managers."
! msgstr "Aktivieren um zu versuchen die Fensterpositionen verschiedener Fenster auch über Programmneustarts hinweg beizubehalten. Funktioniert nicht mit manchen Fenstermanagern."
#. Restore Search History checkbox
--- 924,931 ----
"position of some windows across program invocations. This will not work with "
"certain window managers."
! msgstr ""
! "Aktivieren um zu versuchen die Fensterpositionen verschiedener Fenster auch "
! "über Programmneustarts hinweg beizubehalten. Funktioniert nicht mit manchen "
! "Fenstermanagern."
#. Restore Search History checkbox
***************
*** 930,934 ****
msgid ""
"If set then save and restore the search history across program invocations."
! msgstr "Soll die Suchhistorie über Programmneustarts hinweg beibehalten werden?"
msgid "subschemaSubentry search on root DSE"
--- 935,940 ----
msgid ""
"If set then save and restore the search history across program invocations."
! msgstr ""
! "Soll die Suchhistorie über Programmneustarts hinweg beibehalten werden?"
msgid "subschemaSubentry search on root DSE"
Index: ja.po
===================================================================
RCS file: /cvsroot/gqclient/gq/po/ja.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ja.po 9 Oct 2003 05:54:24 -0000 1.9
--- ja.po 10 Oct 2003 08:22:25 -0000 1.10
***************
*** 6,10 ****
msgstr ""
"Project-Id-Version: gq 1.0alpha1_pre1\n"
! "POT-Creation-Date: 2003-10-06 20:24+0200\n"
"PO-Revision-Date: 2003-10-01 12:06+0900\n"
"Last-Translator: Hatuka*nezumi <ne...@jc...>\n"
--- 6,10 ----
msgstr ""
"Project-Id-Version: gq 1.0alpha1_pre1\n"
! "POT-Creation-Date: 2003-10-10 09:03+0200\n"
"PO-Revision-Date: 2003-10-01 12:06+0900\n"
"Last-Translator: Hatuka*nezumi <ne...@jc...>\n"
***************
*** 305,310 ****
msgstr "¥µ¡¼¥Ð¤È¥Ù¡¼¥¹¼±ÊÌ̾¤â´Þ¤á¤ë"
! #. gtk_container_border_width(GTK_CONTAINER(hbox_buttons), 10);
! msgid "OK"
msgstr "OK"
--- 305,310 ----
msgstr "¥µ¡¼¥Ð¤È¥Ù¡¼¥¹¼±ÊÌ̾¤â´Þ¤á¤ë"
! #, fuzzy
! msgid "_OK"
msgstr "OK"
***************
*** 321,329 ****
msgstr "¥Õ¥£¥ë¥¿"
- #. New button
msgid "_New"
msgstr "¿·µ¬(_N)"
- #. Delete button
msgid "_Delete"
msgstr "ºï½ü(_D)"
--- 321,327 ----
***************
*** 349,364 ****
msgstr "Êݸ(_S)"
! #. PSt: Removed again, as the GUI is too confusing. What
! #. does "OK" mean wrt "Apply"? Which Button does which? It
! #. is not intuitive enough too keep this. AND it still has a
! #. problem after Apply: The current DN does not get
! #. changed.
! #. button = gtk_button_new_with_label(_("Apply"));
! #. gtk_widget_show(button);
! #. gtk_box_pack_start(GTK_BOX(hbox2), button, FALSE, FALSE, 0);
! #. gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
! #. GTK_SIGNAL_FUNC(add_entry_from_formlist_no_close),
! #. (gpointer) iform);
! msgid "Cancel"
msgstr "¼è¾Ã"
--- 347,352 ----
msgstr "Êݸ(_S)"
! #, fuzzy
! msgid "_Cancel"
msgstr "¼è¾Ã"
***************
*** 431,435 ****
msgstr "ºÇ¿·¤Î¾ðÊó¤òɽ¼¨(_R)"
! msgid "Close"
msgstr "ÊĤ¸¤ë"
--- 419,424 ----
msgstr "ºÇ¿·¤Î¾ðÊó¤òɽ¼¨(_R)"
! #, fuzzy
! msgid "_Close"
msgstr "ÊĤ¸¤ë"
***************
*** 756,760 ****
#. Use local cache
! msgid "LDAP cache time_out"
msgstr "LDAP¥¥ã¥Ã¥·¥å¤Î¼÷Ì¿(_O)"
--- 745,750 ----
#. Use local cache
! #, fuzzy
! msgid "LDAP cache timeo_ut"
msgstr "LDAP¥¥ã¥Ã¥·¥å¤Î¼÷Ì¿(_O)"
***************
*** 800,804 ****
#. Cache connections
! msgid "_Cache connection"
msgstr "Àܳ¤ò¥¥ã¥Ã¥·¥å¤¹¤ë(_C)"
--- 790,795 ----
#. Cache connections
! #, fuzzy
! msgid "Cach_e connection"
msgstr "Àܳ¤ò¥¥ã¥Ã¥·¥å¤¹¤ë(_C)"
***************
*** 920,924 ****
#. Format frame
! msgid " Format "
msgstr " ½ñ¼° "
--- 911,916 ----
#. Format frame
! #, fuzzy
! msgid "Format"
msgstr " ½ñ¼° "
***************
*** 937,946 ****
--- 929,953 ----
msgstr ""
+ msgid ""
+ "Turn on if the sizes of some windows should be saved and restored across "
+ "program invocations."
+ msgstr ""
+
#. Restore Window Positions checkbox
msgid "Restore Window Pos_itions"
msgstr ""
+ msgid ""
+ "If turned on, the program will try to save and restore the on-screen "
+ "position of some windows across program invocations. This will not work with "
+ "certain window managers."
+ msgstr ""
+
#. Restore Search History checkbox
msgid "Restore Search _History"
+ msgstr ""
+
+ msgid ""
+ "If set then save and restore the search history across program invocations."
msgstr ""
Index: zh_CN.po
===================================================================
RCS file: /cvsroot/gqclient/gq/po/zh_CN.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** zh_CN.po 9 Oct 2003 05:54:24 -0000 1.4
--- zh_CN.po 10 Oct 2003 08:22:25 -0000 1.5
***************
*** 6,10 ****
msgstr ""
"Project-Id-Version: 0.7.0beta2\n"
! "POT-Creation-Date: 2003-10-06 20:24+0200\n"
"PO-Revision-Date: 2003-01-04 02:58+0800\n"
"Last-Translator: hleil liu <hl...@ya...>\n"
--- 6,10 ----
msgstr ""
"Project-Id-Version: 0.7.0beta2\n"
! "POT-Creation-Date: 2003-10-10 09:03+0200\n"
"PO-Revision-Date: 2003-01-04 02:58+0800\n"
"Last-Translator: hleil liu <hl...@ya...>\n"
***************
*** 307,312 ****
msgstr "¼Çס·þÎñÆ÷ºÍ»ù×¼ DN"
! #. gtk_container_border_width(GTK_CONTAINER(hbox_buttons), 10);
! msgid "OK"
msgstr "È·¶¨"
--- 307,312 ----
msgstr "¼Çס·þÎñÆ÷ºÍ»ù×¼ DN"
! #, fuzzy
! msgid "_OK"
msgstr "È·¶¨"
***************
*** 323,332 ****
msgstr "¹ýÂËÉèÖÃ"
- #. New button
#, fuzzy
msgid "_New"
msgstr "н¨"
- #. Delete button
#, fuzzy
msgid "_Delete"
--- 323,330 ----
***************
*** 358,373 ****
msgstr "±£´æ"
! #. PSt: Removed again, as the GUI is too confusing. What
! #. does "OK" mean wrt "Apply"? Which Button does which? It
! #. is not intuitive enough too keep this. AND it still has a
! #. problem after Apply: The current DN does not get
! #. changed.
! #. button = gtk_button_new_with_label(_("Apply"));
! #. gtk_widget_show(button);
! #. gtk_box_pack_start(GTK_BOX(hbox2), button, FALSE, FALSE, 0);
! #. gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
! #. GTK_SIGNAL_FUNC(add_entry_from_formlist_no_close),
! #. (gpointer) iform);
! msgid "Cancel"
msgstr "È¡Ïû"
--- 356,361 ----
msgstr "±£´æ"
! #, fuzzy
! msgid "_Cancel"
msgstr "È¡Ïû"
***************
*** 438,442 ****
msgstr "Ë¢ÐÂ"
! msgid "Close"
msgstr "¹Ø±Õ"
--- 426,431 ----
msgstr "Ë¢ÐÂ"
! #, fuzzy
! msgid "_Close"
msgstr "¹Ø±Õ"
***************
*** 776,780 ****
#. Use local cache
#, fuzzy
! msgid "LDAP cache time_out"
msgstr "LDAP »º´æʱÏÞ"
--- 765,769 ----
#. Use local cache
#, fuzzy
! msgid "LDAP cache timeo_ut"
msgstr "LDAP »º´æʱÏÞ"
***************
*** 816,820 ****
#. Cache connections
#, fuzzy
! msgid "_Cache connection"
msgstr "Á¬½Ó»º´æ"
--- 805,809 ----
#. Cache connections
#, fuzzy
! msgid "Cach_e connection"
msgstr "Á¬½Ó»º´æ"
***************
*** 950,954 ****
#. Format frame
! msgid " Format "
msgstr "¸ñʽ"
--- 939,944 ----
#. Format frame
! #, fuzzy
! msgid "Format"
msgstr "¸ñʽ"
***************
*** 969,978 ****
--- 959,983 ----
msgstr ""
+ msgid ""
+ "Turn on if the sizes of some windows should be saved and restored across "
+ "program invocations."
+ msgstr ""
+
#. Restore Window Positions checkbox
msgid "Restore Window Pos_itions"
msgstr ""
+ msgid ""
+ "If turned on, the program will try to save and restore the on-screen "
+ "position of some windows across program invocations. This will not work with "
+ "certain window managers."
+ msgstr ""
+
#. Restore Search History checkbox
msgid "Restore Search _History"
+ msgstr ""
+
+ msgid ""
+ "If set then save and restore the search history across program invocations."
msgstr ""
|
|
From: <sta...@us...> - 2003-10-10 07:13:15
|
Update of /cvsroot/gqclient/gq In directory sc8-pr-cvs1:/tmp/cvs-serv11185 Modified Files: configure.in Log Message: * Changed version to 1.0alpha2 - dropped the pre, will be reintroduced for the final release Index: configure.in =================================================================== RCS file: /cvsroot/gqclient/gq/configure.in,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** configure.in 9 Oct 2003 05:55:55 -0000 1.48 --- configure.in 10 Oct 2003 07:13:12 -0000 1.49 *************** *** 30,34 **** AC_INIT(src/gq.c) ! AM_INIT_AUTOMAKE(gq, 1.0alpha1_pre1) LANGPACK_VERSION=1 --- 30,34 ---- AC_INIT(src/gq.c) ! AM_INIT_AUTOMAKE(gq, 1.0alpha2) LANGPACK_VERSION=1 |
|
From: <sta...@us...> - 2003-10-10 07:11:52
|
Update of /cvsroot/gqclient/gq/po
In directory sc8-pr-cvs1:/tmp/cvs-serv10958
Modified Files:
de.po
Log Message:
* New german translations
Index: de.po
===================================================================
RCS file: /cvsroot/gqclient/gq/po/de.po,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** de.po 9 Oct 2003 05:54:24 -0000 1.19
--- de.po 10 Oct 2003 07:11:47 -0000 1.20
***************
*** 6,11 ****
msgstr ""
"Project-Id-Version: gq 1.0\n"
! "POT-Creation-Date: 2003-10-06 20:24+0200\n"
! "PO-Revision-Date: 2003-10-09 07:04+0200\n"
"Last-Translator: Peter Stamfest <pe...@st...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
--- 6,11 ----
msgstr ""
"Project-Id-Version: gq 1.0\n"
! "POT-Creation-Date: 2003-10-10 09:03+0200\n"
! "PO-Revision-Date: 2003-10-10 09:10+0200\n"
"Last-Translator: Peter Stamfest <pe...@st...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
***************
*** 309,315 ****
msgstr "Server und Base DN beibehalten"
! #. gtk_container_border_width(GTK_CONTAINER(hbox_buttons), 10);
! msgid "OK"
! msgstr "OK"
msgid "Server"
--- 309,314 ----
msgstr "Server und Base DN beibehalten"
! msgid "_OK"
! msgstr "_OK"
msgid "Server"
***************
*** 325,333 ****
msgstr "Filter"
- #. New button
msgid "_New"
msgstr "_Neu"
- #. Delete button
msgid "_Delete"
msgstr "_Entfernen"
--- 324,330 ----
***************
*** 353,369 ****
msgstr "S_peichern"
! #. PSt: Removed again, as the GUI is too confusing. What
! #. does "OK" mean wrt "Apply"? Which Button does which? It
! #. is not intuitive enough too keep this. AND it still has a
! #. problem after Apply: The current DN does not get
! #. changed.
! #. button = gtk_button_new_with_label(_("Apply"));
! #. gtk_widget_show(button);
! #. gtk_box_pack_start(GTK_BOX(hbox2), button, FALSE, FALSE, 0);
! #. gtk_signal_connect_object(GTK_OBJECT(button), "clicked",
! #. GTK_SIGNAL_FUNC(add_entry_from_formlist_no_close),
! #. (gpointer) iform);
! msgid "Cancel"
! msgstr "Abbrechen"
msgid "You must fill in a name for the filter"
--- 350,355 ----
msgstr "S_peichern"
! msgid "_Cancel"
! msgstr "_Abbrechen"
msgid "You must fill in a name for the filter"
***************
*** 433,438 ****
msgstr "_Aktualisieren"
! msgid "Close"
! msgstr "Schliessen"
#, c-format
--- 419,424 ----
msgstr "_Aktualisieren"
! msgid "_Close"
! msgstr "S_chliessen"
#, c-format
***************
*** 747,751 ****
#. Use local cache
! msgid "LDAP cache time_out"
msgstr "LDAP Cache Time_out"
--- 733,737 ----
#. Use local cache
! msgid "LDAP cache timeo_ut"
msgstr "LDAP Cache Time_out"
***************
*** 788,792 ****
#. Cache connections
! msgid "_Cache connection"
msgstr "Verbindung beibe_halten"
--- 774,778 ----
#. Cache connections
! msgid "Cach_e connection"
msgstr "Verbindung beibe_halten"
***************
*** 841,845 ****
msgid "_GUI"
! msgstr ""
#. Edit button
--- 827,831 ----
msgid "_GUI"
! msgstr "_GUI"
#. Edit button
***************
*** 906,911 ****
#. Format frame
! msgid " Format "
! msgstr " Format "
msgid "_UMich/OpenLDAP style (no comments/version)"
--- 892,897 ----
#. Format frame
! msgid "Format"
! msgstr "Format"
msgid "_UMich/OpenLDAP style (no comments/version)"
***************
*** 917,933 ****
#. Persistency frame
msgid "Persistency"
! msgstr ""
#. Restore Window Sizes checkbox
msgid "Restore Window Si_zes"
! msgstr ""
#. Restore Window Positions checkbox
msgid "Restore Window Pos_itions"
! msgstr ""
#. Restore Search History checkbox
msgid "Restore Search _History"
! msgstr ""
msgid "subschemaSubentry search on root DSE"
--- 903,934 ----
#. Persistency frame
msgid "Persistency"
! msgstr "Zustandsspeicherung"
#. Restore Window Sizes checkbox
msgid "Restore Window Si_zes"
! msgstr "Fenster G_rößen wiederherstellen"
!
! msgid ""
! "Turn on if the sizes of some windows should be saved and restored across "
! "program invocations."
! msgstr "Aktivieren zur automatischen Wiederherstellung der Fenstergrößen verschiedener Fenster auch über Programmneustarts hinweg."
#. Restore Window Positions checkbox
msgid "Restore Window Pos_itions"
! msgstr "Fenster_positionen wiederherstellen"
!
! msgid ""
! "If turned on, the program will try to save and restore the on-screen "
! "position of some windows across program invocations. This will not work with "
! "certain window managers."
! msgstr "Aktivieren um zu versuchen die Fensterpositionen verschiedener Fenster auch über Programmneustarts hinweg beizubehalten. Funktioniert nicht mit manchen Fenstermanagern."
#. Restore Search History checkbox
msgid "Restore Search _History"
! msgstr "Such_historie wiederherstellen"
!
! msgid ""
! "If set then save and restore the search history across program invocations."
! msgstr "Soll die Suchhistorie über Programmneustarts hinweg beibehalten werden?"
msgid "subschemaSubentry search on root DSE"
|
|
From: <sta...@us...> - 2003-10-10 07:03:00
|
Update of /cvsroot/gqclient/gq
In directory sc8-pr-cvs1:/tmp/cvs-serv9557
Modified Files:
README
Log Message:
* Added notes regarding the update of the configuration file.
Index: README
===================================================================
RCS file: /cvsroot/gqclient/gq/README,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** README 29 Sep 2002 19:01:09 -0000 1.8
--- README 10 Oct 2003 07:02:56 -0000 1.9
***************
*** 16,24 ****
http://biot.com/gq/
! IMPORTANT NOTE:
The configuration file syntax has changed between 0.6.0 and 0.7.0 in
a backwardly incompatible way. You should backup your old configuration, in
case you want/need to go back to a version earlier than 0.7.0!!
Compiling:
--- 16,39 ----
http://biot.com/gq/
! IMPORTANT NOTES:
+ 1.0:
+ * Configuration file syntax
+ The configuration file syntax has changed between 0.7.0 and 1.0 in
+ a backwardly incompatible way. You should backup your old configuration, in
+ case you want/need to go back to a version earlier than 1.0!!
+
+ * Upgrading to GTK2 & configuration
+ The configuration file up to 0.7.0 was saved in a locale specific
+ encoding. When using GTK2 the UTF-8 encoding gets used. Switching
+ back to an older version may cause configuration data corruption!
+
+ 0.7:
The configuration file syntax has changed between 0.6.0 and 0.7.0 in
a backwardly incompatible way. You should backup your old configuration, in
case you want/need to go back to a version earlier than 0.7.0!!
+
+
+
Compiling:
|
|
From: <sta...@us...> - 2003-10-10 07:02:21
|
Update of /cvsroot/gqclient/gq In directory sc8-pr-cvs1:/tmp/cvs-serv9498 Modified Files: ChangeLog Log Message: * Update for the last two days Index: ChangeLog =================================================================== RCS file: /cvsroot/gqclient/gq/ChangeLog,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** ChangeLog 5 Oct 2003 13:57:47 -0000 1.43 --- ChangeLog 10 Oct 2003 07:02:16 -0000 1.44 *************** *** 1,2 **** --- 1,17 ---- + 2003-10-09 Peter Stamfest <pe...@st...> + * Fixed the misuse of the tearoff menu items in many popup menus + * Added defaults for the new GUI preferences + * Fixed a bug that caused a GTK Warning on shutdown + * Added tooltips for the GUI preferences + 2003-10-08 Peter Stamfest <pe...@st...> + * Restructured the statusbar handling: statusbar_msg now takes + a printf-style format and a variable argument list + * Changed the preferences window to not use gtk_object_[sg]et_data + to store the used widgets for later data retrieval. + * Added the use of stock buttons, including nice icons. + * Changed the main window to not use gtk_object_[sg]et_data + to store the used widgets. + * Some more bugfixes and minor restructuring + * Persistant GUI state - introduction if the .gq-state file 2003-10-05 Peter Stamfest <pe...@st...> * Restructured the errorchain handling. At least for me it looks |
|
From: <sta...@us...> - 2003-10-10 06:59:28
|
Update of /cvsroot/gqclient/gq/src
In directory sc8-pr-cvs1:/tmp/cvs-serv8851
Modified Files:
configfile.c configfile.h
Log Message:
* Added defaults for the GUI preferences
Index: configfile.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/configfile.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** configfile.c 8 Oct 2003 22:51:53 -0000 1.37
--- configfile.c 10 Oct 2003 06:59:24 -0000 1.38
***************
*** 599,602 ****
--- 599,606 ----
cfg->changed = 0;
+ cfg->restore_window_sizes = DEFAULT_RESTORE_SIZES;
+ cfg->restore_window_positions = DEFAULT_RESTORE_POSITIONS;
+ cfg->restore_search_history = DEFAULT_RESTORE_SEARCHES;
+
return cfg;
}
Index: configfile.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/configfile.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** configfile.h 8 Oct 2003 22:51:53 -0000 1.26
--- configfile.h 10 Oct 2003 06:59:25 -0000 1.27
***************
*** 62,65 ****
--- 62,69 ----
#define DEFAULT_SHOW_REF 0
+ #define DEFAULT_RESTORE_SIZES 1
+ #define DEFAULT_RESTORE_POSITIONS 0
+ #define DEFAULT_RESTORE_SEARCHES 1
+
/* The following do not _really_ belong in here right now... */
/* LDAP Timeout in seconds */
|
|
From: <sta...@us...> - 2003-10-10 06:59:03
|
Update of /cvsroot/gqclient/gq/src
In directory sc8-pr-cvs1:/tmp/cvs-serv8587
Modified Files:
browse.c input.c input.h schemabrowse.c search.c
Log Message:
* Fixed the popup-menu. Changed the mis-used tearoff menu-item into
separator menu-items. Reasons:
- The tearoff functionality makes no sense for those context sensitive
popup menus anyway
- I think the use of those widgets was mostly to have a separating line
in those menus. This broke for gtk2.
Index: browse.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/browse.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** browse.c 9 Oct 2003 05:47:26 -0000 1.74
--- browse.c 10 Oct 2003 06:58:59 -0000 1.75
***************
*** 2036,2040 ****
--- 2036,2044 ----
gtk_menu_set_title(GTK_MENU(menu), name);
+ #if GTK_MAJOR >= 2
+ menu_item = gtk_separator_menu_item_new();
+ #else
menu_item = gtk_tearoff_menu_item_new();
+ #endif
gtk_menu_append(GTK_MENU(menu), menu_item);
gtk_widget_set_sensitive(menu_item, FALSE);
Index: input.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/input.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** input.c 9 Oct 2003 05:47:26 -0000 1.63
--- input.c 10 Oct 2003 06:58:59 -0000 1.64
***************
*** 183,186 ****
--- 183,187 ----
/* new attribute button */
newattrbutton = gtk_button_new();
+ iform->new_attr_button = newattrbutton;
GTK_WIDGET_UNSET_FLAGS(newattrbutton, GTK_CAN_FOCUS);
***************
*** 490,494 ****
--- 491,500 ----
gtk_menu_set_title(GTK_MENU(menu), buf);
+ #if GTK_MAJOR >= 2
+ menu_item = gtk_separator_menu_item_new();
+ #else
menu_item = gtk_tearoff_menu_item_new();
+ #endif
+
gtk_menu_append(GTK_MENU(menu), menu_item);
gtk_widget_set_sensitive(menu_item, FALSE);
***************
*** 515,519 ****
--- 521,529 ----
gtk_menu_append(GTK_MENU(submenu), label);
+ #if GTK_MAJOR >= 2
+ menu_item = gtk_separator_menu_item_new();
+ #else
menu_item = gtk_tearoff_menu_item_new();
+ #endif
gtk_menu_append(GTK_MENU(submenu), menu_item);
gtk_widget_set_sensitive(menu_item, FALSE);
Index: input.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/input.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** input.h 2 Oct 2003 16:16:26 -0000 1.14
--- input.h 10 Oct 2003 06:58:59 -0000 1.15
***************
*** 32,35 ****
--- 32,36 ----
GtkWidget *parent_window;
GtkWidget *target_vbox;
+ GtkWidget *new_attr_button;
GtkWidget *hide_attr_button;
GtkWidget *table;
Index: schemabrowse.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/schemabrowse.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** schemabrowse.c 8 Oct 2003 22:01:12 -0000 1.19
--- schemabrowse.c 10 Oct 2003 06:58:59 -0000 1.20
***************
*** 318,322 ****
--- 318,326 ----
gtk_menu_item_set_submenu(GTK_MENU_ITEM(root_menu), menu);
+ #if GTK_MAJOR >= 2
+ menu_item = gtk_separator_menu_item_new();
+ #else
menu_item = gtk_tearoff_menu_item_new();
+ #endif
gtk_menu_append(GTK_MENU(menu), menu_item);
gtk_widget_set_sensitive(menu_item, FALSE);
Index: search.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/search.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** search.c 8 Oct 2003 22:01:12 -0000 1.42
--- search.c 10 Oct 2003 06:58:59 -0000 1.43
***************
*** 689,693 ****
--- 689,697 ----
menu = gtk_menu_new();
gtk_menu_item_set_submenu(GTK_MENU_ITEM(root_menu), menu);
+ #if GTK_MAJOR >= 2
+ menu_item = gtk_separator_menu_item_new();
+ #else
menu_item = gtk_tearoff_menu_item_new();
+ #endif
gtk_menu_append(GTK_MENU(menu), menu_item);
gtk_widget_set_sensitive(menu_item, FALSE);
|
|
From: <sta...@us...> - 2003-10-10 06:55:07
|
Update of /cvsroot/gqclient/gq/src
In directory sc8-pr-cvs1:/tmp/cvs-serv8393
Modified Files:
prefs.c
Log Message:
* Added tooltips to the GUI preferences tab
Index: prefs.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/prefs.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** prefs.c 9 Oct 2003 05:51:55 -0000 1.38
--- prefs.c 10 Oct 2003 06:55:03 -0000 1.39
***************
*** 1782,1785 ****
--- 1782,1788 ----
GtkWidget *persistframe;
GtkWidget *vbox1, *button;
+ GtkTooltips *tips;
+
+ tips = gtk_tooltips_new();
/* Persistency frame */
***************
*** 1806,1809 ****
--- 1809,1818 ----
gtk_box_pack_start(GTK_BOX(vbox1), button, FALSE, TRUE, 5);
+ gtk_tooltips_set_tip(tips, button,
+ _("Turn on if the sizes of some windows should be "
+ "saved and restored across program invocations."),
+ S_("tooltip|")
+ );
+
/* Restore Window Positions checkbox */
button = gq_check_button_new_with_label(_("Restore Window Pos_itions"));
***************
*** 1818,1821 ****
--- 1827,1838 ----
gtk_box_pack_start(GTK_BOX(vbox1), button, FALSE, TRUE, 5);
+ gtk_tooltips_set_tip(tips, button,
+ _("If turned on, the program will try to save and "
+ "restore the on-screen position of some windows "
+ "across program invocations. This will not work "
+ "with certain window managers."),
+ S_("tooltip|")
+ );
+
/* Restore Search History checkbox */
button = gq_check_button_new_with_label(_("Restore Search _History"));
***************
*** 1829,1832 ****
--- 1846,1855 ----
gtk_widget_show(button);
gtk_box_pack_start(GTK_BOX(vbox1), button, FALSE, TRUE, 5);
+
+ gtk_tooltips_set_tip(tips, button,
+ _("If set then save and restore the search "
+ "history across program invocations."),
+ S_("tooltip|")
+ );
}
|
|
From: <sta...@us...> - 2003-10-10 06:51:38
|
Update of /cvsroot/gqclient/gq/src
In directory sc8-pr-cvs1:/tmp/cvs-serv8023
Modified Files:
mainwin.c
Log Message:
* Fixed a bug that causes a GTK Warning just before the program shuts
down. Introduced due to the new struct mainwin_data.
Index: mainwin.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/mainwin.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** mainwin.c 9 Oct 2003 05:47:26 -0000 1.39
--- mainwin.c 10 Oct 2003 06:51:34 -0000 1.40
***************
*** 498,502 ****
/* don't waste time refocusing on disappearing tabs */
gtk_signal_disconnect_by_func(GTK_OBJECT(win->mainbook),
! GTK_SIGNAL_FUNC(switchpage_refocus), NULL);
tabs = win->tablist;
--- 498,502 ----
/* don't waste time refocusing on disappearing tabs */
gtk_signal_disconnect_by_func(GTK_OBJECT(win->mainbook),
! GTK_SIGNAL_FUNC(switchpage_refocus), win);
tabs = win->tablist;
|
|
From: <sta...@us...> - 2003-10-10 06:44:04
|
Update of /cvsroot/gqclient/gq
In directory sc8-pr-cvs1:/tmp/cvs-serv7317
Modified Files:
TODO
Log Message:
* More updates
Index: TODO
===================================================================
RCS file: /cvsroot/gqclient/gq/TODO,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** TODO 10 Oct 2003 05:24:50 -0000 1.33
--- TODO 10 Oct 2003 06:44:00 -0000 1.34
***************
*** 10,15 ****
----------------
! * SASL / GSSAPI support is badly broken right now (it seems) - there
! are several bug reports pending.
* update schemabrowse tree on serverlist update (browsetree already done)
--- 10,16 ----
----------------
! * [1.0] SASL / GSSAPI support is badly broken right now (it seems) -
! there are several bug reports pending. If this cannot be done for
! 1.0 it will be marked as BROKEN in the GUI
* update schemabrowse tree on serverlist update (browsetree already done)
***************
*** 69,73 ****
* Make the tabs (Search/Browse/Schema) object oriented.
! * [1.0] Follow referrals
- somehow indicate a referral in the browse tree and allow to
follow it, maybe through the context menu? Configurable?
--- 70,74 ----
* Make the tabs (Search/Browse/Schema) object oriented.
! * [1.0] Referral support
- somehow indicate a referral in the browse tree and allow to
follow it, maybe through the context menu? Configurable?
***************
*** 107,112 ****
(see below) for encoding reasons.
! * [1.x] never do ldap_add when moving trees. Use triangulation like with the
! towers of hanoi
* [1.x] More displaytypes
--- 108,114 ----
(see below) for encoding reasons.
! * [1.x] never do ldap_add when moving trees. (Use triangulation like
! with the towers of hanoi?) Only change DNs to make sure NO
! information can get lost.
* [1.x] More displaytypes
|
|
From: <sta...@us...> - 2003-10-10 05:24:58
|
Update of /cvsroot/gqclient/gq
In directory sc8-pr-cvs1:/tmp/cvs-serv29992
Modified Files:
TODO
Log Message:
* Updated for to-be-posted mailing list message inviting contributions
Index: TODO
===================================================================
RCS file: /cvsroot/gqclient/gq/TODO,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** TODO 7 Oct 2003 14:07:25 -0000 1.32
--- TODO 10 Oct 2003 05:24:50 -0000 1.33
***************
*** 1,12 ****
TODO list and ROADMAP
NOTE: [1.0] denotes features to be implemented for 1.0
[1.x] denotes features to be implemented for 1.0 or later
INTERESTING BUGS
* update schemabrowse tree on serverlist update (browsetree already done)
- * Change schemabrowse tree to ctree, this would allow for the update thing
- (see above) to work as well.
* search mode:
--- 1,17 ----
TODO list and ROADMAP
+ ---------------------
NOTE: [1.0] denotes features to be implemented for 1.0
[1.x] denotes features to be implemented for 1.0 or later
+
+ ----------------
INTERESTING BUGS
+ ----------------
+
+ * SASL / GSSAPI support is badly broken right now (it seems) - there
+ are several bug reports pending.
* update schemabrowse tree on serverlist update (browsetree already done)
* search mode:
***************
*** 15,27 ****
* Memory leaks - though it has been getting better. I do no longer belief them
! to be (purely) gtk related.
* search mode: (peter)
Take displaytypes into account when building the search result list. It does
not make sense to show a jpegPhoto as a string...
! * Honor RFC2253 and the possible hex-encoding there even for OpenLDAP 2.0.x
! More generally: Deal with special characters in DNs.
* [1.x] Better error reporting of LDAP error situations. Currently we handle
LDAP_SUCCESS and LDAP_SERVER_DOWN but ignore the rest. Pointed out
indirectly by Bernhard Reiter <ber...@in...>.
* [1.x] Think about the moving stuff in browse mode:
Either
--- 20,39 ----
* Memory leaks - though it has been getting better. I do no longer belief them
! to be (purely) gtk related (Especially since glib/gtk maintains a
! pool of free memory itself).
!
* search mode: (peter)
Take displaytypes into account when building the search result list. It does
not make sense to show a jpegPhoto as a string...
!
! * Proper OpenLDAP 2.1 support, taking care of all DN-related issues wrt
! the encoding of unusual DNs (Honor RFC2253 and the possible
! hex-encoding there even for OpenLDAP 2.0.x More generally: Deal with
! special characters in DNs.)
!
* [1.x] Better error reporting of LDAP error situations. Currently we handle
LDAP_SUCCESS and LDAP_SERVER_DOWN but ignore the rest. Pointed out
indirectly by Bernhard Reiter <ber...@in...>.
+
* [1.x] Think about the moving stuff in browse mode:
Either
***************
*** 31,50 ****
sizelimits???
UNINTERESTING BUGS
* load_context errors should pop up after mainwin
MINOR
* use scrolled area in error_flush: ldifadd.c may generate 1000s of errors
- ENHANCEMENTS
! * Add all superclasses should they be missing when adding objectClasses.
! [Jonas Petersson <za...@xm...>]
* [1.0] Get rid of Hashtables as central data structures. This is to
! get in some type safety. Use a run-type typing system to catch
! improper use of data structures [Mostly done by Bert]
* Make the tabs (Search/Browse/Schema) object oriented.
--- 43,69 ----
sizelimits???
+
+ ------------------
UNINTERESTING BUGS
+ ------------------
* load_context errors should pop up after mainwin
+
+ -----
MINOR
+ -----
* use scrolled area in error_flush: ldifadd.c may generate 1000s of errors
! ------------
! ENHANCEMENTS
! ------------
* [1.0] Get rid of Hashtables as central data structures. This is to
! get in some type safety. [Mostly done by Bert for tabs, done by
! Peter for mainwin and preferences]
! Use a run-type typing system to catch improper use of data structures
* Make the tabs (Search/Browse/Schema) object oriented.
***************
*** 52,56 ****
* [1.0] Follow referrals
- somehow indicate a referral in the browse tree and allow to
! follow it, maybe through the context menu?
* templates: allow defaults?
--- 71,75 ----
* [1.0] Follow referrals
- somehow indicate a referral in the browse tree and allow to
! follow it, maybe through the context menu? Configurable?
* templates: allow defaults?
***************
*** 66,81 ****
* import from LDIF
! * dt_oc: allow for automatic addition of intermediate objectClasses. Add
! a default "top" template, with only the single "top" objectClass. These
! two changes allow for efficient addition of objects of a single "class".
! Suggested by Emil Assarsson <emi...@bo...>
!
! * nested main loop invocations during possibly long running LDAP operations
! (any search), allow to interrupt running operations in certain situations.
! See mail by Emil Assarsson <emi...@bo...> dated
! Wed, 09 Oct 2002 19:40:37 +0200.
! * Rewrite the schema browser to also use the GtkCTree widget.
* [1.0] Improve LDAP error reporting
--- 85,104 ----
* import from LDIF
! * dt_oc: allow for automatic addition of intermediate
! objectClasses. Add a default "top" template, with only the single
! "top" objectClass. These two changes allow for efficient addition of
! objects of a single "class". Suggested by Emil Assarsson
! <emi...@bo...> * Add all superclasses should they be
! missing when adding objectClasses. [Jonas Petersson <za...@xm...>]
+ * nested main loop invocations during possibly long running LDAP
+ operations (any search), allow to interrupt running operations in
+ certain situations. See mail by Emil Assarsson
+ <emi...@bo...> dated Wed, 09 Oct 2002 19:40:37
+ +0200.
! * [1.x] Even more gtk2 support. I would like to switch the Schema
! Browser to the new gtk2 GtkTreeView infrastructure. For 1.0 the old
! browser must remain working.
* [1.0] Improve LDAP error reporting
***************
*** 95,114 ****
BLUE SKY
* schema designer (when OpenLDAP supports writable schema)
* generate change and undo log in LDIF
! --------------------------------------------------------------------------
FIXED BUGS / IMPLEMENTED ENHANCEMENTS
* [1.0] Switch to a proper XML parser for configuration file
parsing. MUST DO THIS or we will end in an encoding mess when using
gtk2. When first starting up, the encoding of an old configuration
! file must be found out. The only way to do this is by using the default
! codepage setting. The need to switch to a proper parser also arises
! due to the requirement to properly parse multi-byte characters in
! config files. This does not really work currently.
* search mode:
--- 118,143 ----
+ --------
BLUE SKY
+ --------
* schema designer (when OpenLDAP supports writable schema)
* generate change and undo log in LDIF
! #########################################################################
! #########################################################################
! #########################################################################
+ -------------------------------------
FIXED BUGS / IMPLEMENTED ENHANCEMENTS
+ -------------------------------------
* [1.0] Switch to a proper XML parser for configuration file
parsing. MUST DO THIS or we will end in an encoding mess when using
gtk2. When first starting up, the encoding of an old configuration
! file must be found out. The only way to do this is by using the
! default codepage setting. The need to switch to a proper parser also
! arises due to the requirement to properly parse multi-byte
! characters in config files. This does not really work currently.
* search mode:
|
|
From: <sta...@us...> - 2003-10-09 18:00:32
|
Update of /cvsroot/gqclient/gq/src In directory sc8-pr-cvs1:/tmp/cvs-serv6741 Modified Files: xmlparse.c Log Message: * Fixed a bug wrt to the position of macros redefining "malloc" and "free" Index: xmlparse.c =================================================================== RCS file: /cvsroot/gqclient/gq/src/xmlparse.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** xmlparse.c 9 Oct 2003 05:19:39 -0000 1.6 --- xmlparse.c 9 Oct 2003 18:00:26 -0000 1.7 *************** *** 51,58 **** /* This is the only part specific to GTK, I hope */ #include <gtk/gtk.h> - #define malloc g_malloc - #define calloc(n,s) g_malloc0(n * s) #include "xmlparse.h" #define TAGSTACK_INCR 20 --- 51,59 ---- /* This is the only part specific to GTK, I hope */ #include <gtk/gtk.h> #include "xmlparse.h" + + #define malloc g_malloc + #define calloc(n,s) g_malloc0(n * s) #define TAGSTACK_INCR 20 |
|
From: <sta...@us...> - 2003-10-09 05:55:59
|
Update of /cvsroot/gqclient/gq
In directory sc8-pr-cvs1:/tmp/cvs-serv10676
Modified Files:
configure.in
Log Message:
* check if g_string_sprintf allows for argument reordering
(results actually not used, but it might give a hint once
support for this appears)
Index: configure.in
===================================================================
RCS file: /cvsroot/gqclient/gq/configure.in,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** configure.in 5 Oct 2003 13:57:19 -0000 1.47
--- configure.in 9 Oct 2003 05:55:55 -0000 1.48
***************
*** 562,570 ****
fi
! AC_CACHE_CHECK([if snprinf follow the C99 standard], gq_cv_c99_snprintf,
[
AC_TRY_RUN([
--- 562,593 ----
fi
+ PRINTF=g_string_sprintf
+ AC_CACHE_CHECK([reorderable $PRINTF arguments], gq_cv_${PRINTF}_reordering,
+ [
+ AC_TRY_RUN([
+ #include <stdio.h>
+ #include <string.h> #include <glib.h>
+ int main(int argc, char **argv) {
+ char buf[80];
+ GString *str = g_string_new("");
+ $PRINTF(str, "%2\$d %1\$d", 1, 2);
+ if (strcmp(str->str, "2 1") == 0)
+ return 0;
+ return 1;
+ }
+ ],
+ eval "gq_cv_${PRINTF}_reordering=yes",
+ eval "gq_cv_${PRINTF}_reordering=no",
+ eval "gq_cv_${PRINTF}_reordering=no"
+ )
+ ]
+ )
!
!
! AC_CACHE_CHECK([if snprintf follows the C99 standard], gq_cv_c99_snprintf,
[
AC_TRY_RUN([
|
|
From: <sta...@us...> - 2003-10-09 05:54:28
|
Update of /cvsroot/gqclient/gq/po In directory sc8-pr-cvs1:/tmp/cvs-serv10407 Modified Files: Makefile.in.in cs.po de.po ja.po zh_CN.po Log Message: * Finally got rid of the ever changing line-numbers bloating every small change/checkit within the po directory Index: Makefile.in.in =================================================================== RCS file: /cvsroot/gqclient/gq/po/Makefile.in.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.in.in 11 Oct 2002 13:43:41 -0000 1.2 --- Makefile.in.in 9 Oct 2003 05:54:24 -0000 1.3 *************** *** 36,40 **** MSGFMT = @MSGFMT@ XGETTEXT = @XGETTEXT@ ! MSGMERGE = msgmerge DEFS = @DEFS@ --- 36,40 ---- MSGFMT = @MSGFMT@ XGETTEXT = @XGETTEXT@ ! MSGMERGE = msgmerge --no-location DEFS = @DEFS@ Index: cs.po =================================================================== RCS file: /cvsroot/gqclient/gq/po/cs.po,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** cs.po 30 Sep 2003 17:20:24 -0000 1.5 --- cs.po 9 Oct 2003 05:54:24 -0000 1.6 *************** *** 6,10 **** msgstr "" "Project-Id-Version: gq 0.6.0\n" ! "POT-Creation-Date: 2003-09-30 18:54+0200\n" "PO-Revision-Date: 2002-10-09 14:40+0200\n" "Last-Translator: Tomas Dobrovolny <tom...@at...>\n" --- 6,10 ---- msgstr "" "Project-Id-Version: gq 0.6.0\n" ! "POT-Creation-Date: 2003-10-06 20:24+0200\n" "PO-Revision-Date: 2002-10-09 14:40+0200\n" [...2128 lines suppressed...] + #~ "'False' (nepravda)" + + #~ msgid "Error parsing configfile" + #~ msgstr "Chyba zpracování konfiguraèního souboru" + + #, fuzzy + #~ msgid "line %1$d: unmarked data '%2$s'" + #~ msgstr "øádek %d: neoznaèená data '%s'" + + #, fuzzy + #~ msgid "line %1$d: can't close %2$s here\n" + #~ msgstr "øádek %d: nelze ukonèit %s tady\n" + + #~ msgid "Oops! errorchain free error. Exiting...\n" + #~ msgstr "Tì pic! errorchain chyba uvolnìní. Ukonèuji...\n" + + #~ msgid " View " + #~ msgstr " Pohled " #~ msgid "You must select 'filter', not 'search'" Index: de.po =================================================================== RCS file: /cvsroot/gqclient/gq/po/de.po,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** de.po 30 Sep 2003 17:20:24 -0000 1.18 --- de.po 9 Oct 2003 05:54:24 -0000 1.19 *************** *** 5,19 **** msgid "" msgstr "" ! "Project-Id-Version: gq 0.7.0beta2\n" ! "POT-Creation-Date: 2003-09-30 18:54+0200\n" ! "PO-Revision-Date: 2003-09-30 19:03+0200\n" "Last-Translator: Peter Stamfest <pe...@st...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" ! "Content-Transfer-Encoding: ENCODING\n" [...2125 lines suppressed...] + + #~ msgid "Error parsing configfile" + #~ msgstr "Fehler beim Lesen der Konfigurationsdatei" + + #~ msgid "line %1$d: unmarked data '%2$s'" + #~ msgstr "Zeile %1$d: Nicht interpretierbare Daten '%2$s'" + + #~ msgid "line %1$d: can't close %2$s here\n" + #~ msgstr "Zeile %1$d: '%2$s' kann hier nicht geschlossen werden\n" + + #~ msgid "Unsupported password encoding" + #~ msgstr "Nicht unterstützte Passwortcodierung" + + #~ msgid "Oops! errorchain free error. Exiting...\n" + #~ msgstr "Fehler! Errorchain Freigabefehler. Beenden...\n" + + #~ msgid " View " + #~ msgstr " Ansicht " #~ msgid "You must select 'filter', not 'search'" Index: ja.po =================================================================== RCS file: /cvsroot/gqclient/gq/po/ja.po,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ja.po 30 Sep 2003 17:20:25 -0000 1.8 --- ja.po 9 Oct 2003 05:54:24 -0000 1.9 *************** *** 1,11 **** # The common-Japanese po file for gq. ! # Copyright (C) 2002 Hatuka*nezumi , redistributable under the GPL ! # Hatuka*nezumi <ne...@jc...>, 2002. # msgid "" msgstr "" ! "Project-Id-Version: gq 0.6.0\n" ! "POT-Creation-Date: 2003-09-30 18:54+0200\n" ! "PO-Revision-Date: 2002-10-13 12:38+0900\n" "Last-Translator: Hatuka*nezumi <ne...@jc...>\n" [...2845 lines suppressed...] + #~ msgstr "ÀßÄê¥Õ¥¡¥¤¥ë²òÀÏÃæ¤Î¥¨¥é¡¼" + + #, fuzzy + #~ msgid "line %1$d: unmarked data '%2$s'" + #~ msgstr "%d ¹ÔÌÜ: ¥Ç¡¼¥¿ '%s' ¤Ï¥Þ¡¼¥¯¥¢¥Ã¥×¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" + + #, fuzzy + #~ msgid "line %1$d: can't close %2$s here\n" + #~ msgstr "%d ¹ÔÌÜ: %s ¤Ï, ¤³¤³¤Ç¤ÏÊĤ¸¤é¤ì¤Þ¤»¤ó\n" + + #~ msgid "Unsupported password encoding" + #~ msgstr "Âбþ¤·¤Æ¤¤¤Ê¤¤¥Ñ¥¹¥ï¡¼¥ÉÉä¹æ²½Êý¼°" + + #~ msgid "Oops! errorchain free error. Exiting...\n" + #~ msgstr "¤¦¤ï¤Ã! errorchain ¤Î²òÊü¤Ç¥¨¥é¡¼¤Ç¤¹. ½ªÎ»¤·¤Þ¤¹...\n" + + #~ msgid " View " + #~ msgstr " ɽ¼¨ " #~ msgid "You must select 'filter', not 'search'" Index: zh_CN.po =================================================================== RCS file: /cvsroot/gqclient/gq/po/zh_CN.po,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** zh_CN.po 30 Sep 2003 17:20:25 -0000 1.3 --- zh_CN.po 9 Oct 2003 05:54:24 -0000 1.4 *************** *** 6,10 **** msgstr "" "Project-Id-Version: 0.7.0beta2\n" ! "POT-Creation-Date: 2003-09-30 18:54+0200\n" "PO-Revision-Date: 2003-01-04 02:58+0800\n" "Last-Translator: hleil liu <hl...@ya...>\n" --- 6,10 ---- msgstr "" "Project-Id-Version: 0.7.0beta2\n" ! "POT-Creation-Date: 2003-10-06 20:24+0200\n" "PO-Revision-Date: 2003-01-04 02:58+0800\n" [...2116 lines suppressed...] + #~ msgstr "·ÖÎöÅäÖÃÎļþ³ö´í¡£" + + #, fuzzy + #~ msgid "line %1$d: unmarked data '%2$s'" + #~ msgstr "ÐÐ %d£ºÎ´±ê¼ÇµÄÊý¾Ý ¡°%s¡±" + + #, fuzzy + #~ msgid "line %1$d: can't close %2$s here\n" + #~ msgstr "ÐÐ %d£º´Ë´¦²»ÄÜ¹Ø±Õ %s\n" + + #~ msgid "Unsupported password encoding" + #~ msgstr "²»Ö§³ÖµÄÃÜÂë¸ñʽ" + + #~ msgid "Oops! errorchain free error. Exiting...\n" + #~ msgstr "°¥ßº£¡´íÎóÁ´ÊÍ·Å´íÎó¡£Í˳ö...\n" + + #~ msgid " View " + #~ msgstr "²é¿´" #~ msgid "You must select 'filter', not 'search'" |
|
From: <sta...@us...> - 2003-10-09 05:51:59
|
Update of /cvsroot/gqclient/gq/src
In directory sc8-pr-cvs1:/tmp/cvs-serv9938
Modified Files:
prefs.c prefs.h
Log Message:
* Replaced the set_data/get_data stuff in the preferences window with
the new struct prefs_windata.
* Allow only one preferences window at a time
Index: prefs.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/prefs.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** prefs.c 9 Oct 2003 05:47:26 -0000 1.37
--- prefs.c 9 Oct 2003 05:51:55 -0000 1.38
***************
*** 50,55 ****
#include "state.h"
! struct ldapserver *current_selected_server = NULL;
static GtkWidget *current_edit_server_window = NULL;
static GtkWidget *current_serverstab_serverclist = NULL;
GtkWidget *current_template_clist = NULL; /* FIXME: used in
--- 50,59 ----
#include "state.h"
! /* for now: only allow a single preferences window */
[...1844 lines suppressed...]
*** 1827,1844 ****
}
#endif
-
- GtkWidget* get_widget(GtkWidget *widget, gchar *widget_name)
- {
- GtkWidget *found_widget;
-
- if(widget->parent)
- widget = gtk_widget_get_toplevel(widget);
- found_widget = (GtkWidget*) gtk_object_get_data(GTK_OBJECT(widget),
- widget_name);
- if(!found_widget)
- g_warning("Widget not found: %s", widget_name);
-
- return found_widget;
- }
--- 1910,1913 ----
Index: prefs.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/prefs.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** prefs.h 29 Sep 2003 19:24:17 -0000 1.6
--- prefs.h 9 Oct 2003 05:51:55 -0000 1.7
***************
*** 1,6 ****
/*
GQ -- a GTK-based LDAP client
! Copyright (C) 1998-2001 Bert Vermeulen
! Copyright (C) 2002 Bert Vermeulen and Peter Stamfest <pe...@st...>
This program is released under the Gnu General Public License with
--- 1,6 ----
/*
GQ -- a GTK-based LDAP client
! Copyright (C) 1998-2003 Bert Vermeulen
! Copyright (C) 2002-2003 Peter Stamfest <pe...@st...>
This program is released under the Gnu General Public License with
***************
*** 31,53 ****
#include "common.h"
void create_edit_server_window(struct ldapserver *server);
- void serverstab_newbutton_callback(GtkWidget *widget, GtkWidget *clist);
- void serverstab_editbutton_callback(GtkWidget *widget, GtkWidget *clist);
- void server_selected_callback(GtkWidget *clist, gint row, gint column,
- GdkEventButton *event, gpointer data);
- void server_unselected_callback(GtkWidget *clist, gint row, gint column,
- GdkEventButton *event, gpointer data);
void fill_serverlist_serverstab(void);
void create_prefs_window(void);
- void create_serverstab(GtkWidget *target);
- void create_templatestab(GtkWidget *target, GtkWidget *targetwindow);
- void create_browse_optionstab(GtkWidget *target, GtkWidget *targetwindow);
- void create_search_optionstab(GtkWidget *target, GtkWidget *targetwindow);
- void create_ldiftab(GtkWidget *target, GtkWidget *targetwindow);
- void template_new_callback(GtkWidget *widget, GtkWidget *combo);
- void template_edit_callback(GtkWidget *widget, GtkWidget *dummy);
- void template_selected_callback(GtkWidget *clist, gint row, gint column,
- GdkEventButton *event, gpointer data);
- void template_delete_callback(GtkWidget *widget, GtkWidget *target);
GtkWidget* get_widget(GtkWidget *widget, gchar *widget_name);
--- 31,41 ----
#include "common.h"
+
+ /* fwd decl */
+ struct prefs_widgets;
+
void create_edit_server_window(struct ldapserver *server);
void fill_serverlist_serverstab(void);
void create_prefs_window(void);
GtkWidget* get_widget(GtkWidget *widget, gchar *widget_name);
|
|
From: <sta...@us...> - 2003-10-09 05:47:31
|
Update of /cvsroot/gqclient/gq/src
In directory sc8-pr-cvs1:/tmp/cvs-serv9389
Modified Files:
browse.c filter.c gq.c input.c mainwin.c mainwin.h prefs.c
util.c
Log Message:
* Got rid of the set_data/get_data stuff in the main window by introducing
the struct mainwin_data
* Changed the about window label justification and added some more version
information
Index: browse.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/browse.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** browse.c 8 Oct 2003 22:01:04 -0000 1.73
--- browse.c 9 Oct 2003 05:47:26 -0000 1.74
***************
*** 406,410 ****
gtk_widget_show(pane2_vbox);
! gtk_widget_set_parent_window(pane2_vbox, (GdkWindow *) mainwin);
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(pane2_scrwin), pane2_vbox);
--- 406,410 ----
gtk_widget_show(pane2_vbox);
! gtk_widget_set_parent_window(pane2_vbox, (mainwin.mainwin->window));
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(pane2_scrwin), pane2_vbox);
***************
*** 815,819 ****
ld = open_connection(entry->server);
}
! statusbar_msg(ldap_err2string(msg));
} else {
if(res == NULL) continue;
--- 815,819 ----
ld = open_connection(entry->server);
}
! statusbar_msg("%s", ldap_err2string(msg));
} else {
if(res == NULL) continue;
***************
*** 1118,1122 ****
search_tab = get_last_of_mode(SEARCH_MODE);
if (!search_tab) {
! new_modetab(SEARCH_MODE);
search_tab = get_last_of_mode(SEARCH_MODE);
}
--- 1118,1122 ----
search_tab = get_last_of_mode(SEARCH_MODE);
if (!search_tab) {
! new_modetab(&mainwin, SEARCH_MODE);
search_tab = get_last_of_mode(SEARCH_MODE);
}
Index: filter.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/filter.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** filter.c 9 Oct 2003 05:15:06 -0000 1.21
--- filter.c 9 Oct 2003 05:47:26 -0000 1.22
***************
*** 95,99 ****
void add_filter(GtkWidget *filternamebox)
{
! GtkWidget *focusbox, *filtermenu, *menuitem, *button;
GtkWidget *server_combo, *searchbase_combo;
GList *filterlist;
--- 95,99 ----
void add_filter(GtkWidget *filternamebox)
{
! GtkWidget *focusbox, *menuitem, *button;
GtkWidget *server_combo, *searchbase_combo;
GList *filterlist;
***************
*** 106,111 ****
/* find current tab */
! tabnum = gtk_notebook_get_current_page(GTK_NOTEBOOK(mainbook));
! tab = g_list_nth_data(tablist, tabnum);
/* ignore if it's not a search mode tab */
--- 106,111 ----
/* find current tab */
! tabnum = gtk_notebook_get_current_page(GTK_NOTEBOOK(mainwin.mainbook));
! tab = g_list_nth_data(mainwin.tablist, tabnum);
/* ignore if it's not a search mode tab */
***************
*** 181,190 ****
/* and add it to the Filters menu */
- filtermenu = gtk_object_get_data(GTK_OBJECT(mainwin), "filtermenu");
menuitem = gtk_menu_item_new_with_label(filtername);
gtk_object_set_data(GTK_OBJECT(menuitem), "filter", filter);
gtk_signal_connect_object(GTK_OBJECT(menuitem), "activate",
GTK_SIGNAL_FUNC(filter_selected), (GtkObject *) filter);
! gtk_container_add(GTK_CONTAINER(filtermenu), menuitem);
gtk_widget_show(menuitem);
--- 181,189 ----
/* and add it to the Filters menu */
menuitem = gtk_menu_item_new_with_label(filtername);
gtk_object_set_data(GTK_OBJECT(menuitem), "filter", filter);
gtk_signal_connect_object(GTK_OBJECT(menuitem), "activate",
GTK_SIGNAL_FUNC(filter_selected), (GtkObject *) filter);
! gtk_container_add(GTK_CONTAINER(mainwin.filtermenu), menuitem);
gtk_widget_show(menuitem);
***************
*** 276,281 ****
/* find current tab */
! tabnum = gtk_notebook_get_current_page(GTK_NOTEBOOK(mainbook));
! tab = g_list_nth_data(tablist, tabnum);
/* we're in luck if the current tab is a Search tab: just use this one */
--- 275,280 ----
/* find current tab */
! tabnum = gtk_notebook_get_current_page(GTK_NOTEBOOK(mainwin.mainbook));
! tab = g_list_nth_data(mainwin.tablist, tabnum);
/* we're in luck if the current tab is a Search tab: just use this one */
***************
*** 532,541 ****
void remove_from_filtermenu(struct gq_filter *filter)
{
! GtkWidget *filtermenu, *menuitem;
GList *menuitems;
struct gq_filter *found_filter;
! filtermenu = gtk_object_get_data(GTK_OBJECT(mainwin), "filtermenu");
! menuitems = gtk_container_children(GTK_CONTAINER(filtermenu));
while(menuitems) {
--- 531,539 ----
void remove_from_filtermenu(struct gq_filter *filter)
{
! GtkWidget *menuitem;
GList *menuitems;
struct gq_filter *found_filter;
! menuitems = gtk_container_children(GTK_CONTAINER(mainwin.filtermenu));
while(menuitems) {
***************
*** 543,547 ****
found_filter = gtk_object_get_data(GTK_OBJECT(menuitem), "filter");
if(filter == found_filter) {
! gtk_container_remove(GTK_CONTAINER(filtermenu), menuitem);
break;
}
--- 541,545 ----
found_filter = gtk_object_get_data(GTK_OBJECT(menuitem), "filter");
if(filter == found_filter) {
! gtk_container_remove(GTK_CONTAINER(mainwin.filtermenu), menuitem);
break;
}
***************
*** 757,761 ****
{
! GtkWidget *entry, *text, *filter_clist, *filtermenu, *menuitem;
GList *filterlist, *menuitems, *menuwidgets;
struct gq_filter *filter, *found_filter;
--- 755,759 ----
{
! GtkWidget *entry, *text, *filter_clist, *menuitem;
GList *filterlist, *menuitems, *menuwidgets;
struct gq_filter *filter, *found_filter;
***************
*** 866,875 ****
/* add to Filters menu */
- filtermenu = gtk_object_get_data(GTK_OBJECT(mainwin), "filtermenu");
menuitem = gtk_menu_item_new_with_label(filter->name);
gtk_object_set_data(GTK_OBJECT(menuitem), "filter", filter);
gtk_signal_connect_object(GTK_OBJECT(menuitem), "activate",
GTK_SIGNAL_FUNC(filter_selected), (GtkObject *) filter);
! gtk_container_add(GTK_CONTAINER(filtermenu), menuitem);
gtk_widget_show(menuitem);
--- 864,872 ----
/* add to Filters menu */
menuitem = gtk_menu_item_new_with_label(filter->name);
gtk_object_set_data(GTK_OBJECT(menuitem), "filter", filter);
gtk_signal_connect_object(GTK_OBJECT(menuitem), "activate",
GTK_SIGNAL_FUNC(filter_selected), (GtkObject *) filter);
! gtk_container_add(GTK_CONTAINER(mainwin.filtermenu), menuitem);
gtk_widget_show(menuitem);
***************
*** 889,894 ****
/* find old filter in the menu, and change it there */
! filtermenu = gtk_object_get_data(GTK_OBJECT(mainwin), "filtermenu");
! menuitems = gtk_container_children(GTK_CONTAINER(filtermenu));
while(menuitems) {
menuitem = menuitems->data;
--- 886,890 ----
/* find old filter in the menu, and change it there */
! menuitems = gtk_container_children(GTK_CONTAINER(mainwin.filtermenu));
while(menuitems) {
menuitem = menuitems->data;
Index: gq.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/gq.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** gq.c 5 Oct 2003 22:22:12 -0000 1.19
--- gq.c 9 Oct 2003 05:47:26 -0000 1.20
***************
*** 125,129 ****
setup_fonts();
! create_mainwin();
g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL);
--- 125,129 ----
setup_fonts();
! create_mainwin(&mainwin);
g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL);
Index: input.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/input.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** input.c 9 Oct 2003 05:15:06 -0000 1.62
--- input.c 9 Oct 2003 05:47:26 -0000 1.63
***************
*** 1219,1223 ****
gq_exploded_free(rdn);
! for (tabs = g_list_first(tablist) ; tabs ; tabs = g_list_next(tabs)) {
tab = (struct tab *) tabs->data;
if(tab->type == BROWSE_MODE) {
--- 1219,1224 ----
gq_exploded_free(rdn);
! for (tabs = g_list_first(mainwin.tablist) ; tabs ;
! tabs = g_list_next(tabs)) {
tab = (struct tab *) tabs->data;
if(tab->type == BROWSE_MODE) {
Index: mainwin.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/mainwin.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** mainwin.c 9 Oct 2003 05:15:06 -0000 1.38
--- mainwin.c 9 Oct 2003 05:47:26 -0000 1.39
***************
*** 52,61 ****
#endif
! GtkWidget *mainwin = NULL;
! GtkWidget *mainbook = NULL;
! GtkWidget *statusbar;
! GList *tablist = NULL;
- static GHashTable *lastofmode = NULL;
--- 52,57 ----
#endif
! struct mainwin_data mainwin;
***************
*** 64,71 ****
{
! if(!lastofmode)
return NULL;
! return g_hash_table_lookup(lastofmode, GINT_TO_POINTER(mode));
}
--- 60,67 ----
{
! if(!mainwin.lastofmode)
return NULL;
! return g_hash_table_lookup(mainwin.lastofmode, GINT_TO_POINTER(mode));
}
***************
*** 74,78 ****
{
! gtk_notebook_set_page(GTK_NOTEBOOK(mainbook), g_list_index(tablist, tab));
}
--- 70,75 ----
{
! gtk_notebook_set_page(GTK_NOTEBOOK(mainwin.mainbook),
! g_list_index(mainwin.tablist, tab));
}
***************
*** 82,89 ****
{
! if(!lastofmode)
! lastofmode = g_hash_table_new(g_direct_hash, g_direct_equal);
! g_hash_table_insert(lastofmode, (gpointer) tab->type, tab);
}
--- 79,86 ----
{
! if(!mainwin.lastofmode)
! mainwin.lastofmode = g_hash_table_new(g_direct_hash, g_direct_equal);
! g_hash_table_insert(mainwin.lastofmode, (gpointer) tab->type, tab);
}
***************
*** 116,128 ****
/* gtk2 checked (multiple destroy callbacks safety), confidence 0.7:
cleanup_all_tabs semantics? */
! void gq_exit(GtkWidget *widget, gpointer *data)
{
! cleanup();
gtk_main_quit();
}
! void cleanup(void)
{
! cleanup_all_tabs();
}
--- 113,125 ----
/* gtk2 checked (multiple destroy callbacks safety), confidence 0.7:
cleanup_all_tabs semantics? */
! void gq_exit(GtkWidget *widget, struct mainwin_data *win)
{
! cleanup(win);
gtk_main_quit();
}
! void cleanup(struct mainwin_data *win)
{
! cleanup_all_tabs(win);
}
***************
*** 160,164 ****
}
! void create_mainwin(void)
{
GtkWidget *outer_vbox, *main_vbox, *menubar, *menuitem, *submenu;
--- 157,176 ----
}
! static void new_modetab_search(struct mainwin_data *win)
! {
! new_modetab(win, SEARCH_MODE);
! }
!
! static void new_modetab_browse(struct mainwin_data *win)
! {
! new_modetab(win, BROWSE_MODE);
! }
!
! static void new_modetab_schema(struct mainwin_data *win)
! {
! new_modetab(win, SCHEMA_MODE);
! }
!
! void create_mainwin(struct mainwin_data *win)
{
GtkWidget *outer_vbox, *main_vbox, *menubar, *menuitem, *submenu;
***************
*** 172,187 ****
struct gq_filter *filter;
/* mainwin = gtk_window_new(GTK_WINDOW_TOPLEVEL); */
/* gtk_window_set_default_size(GTK_WINDOW(mainwin), 770, 478); */
! mainwin = stateful_gtk_window_new(GTK_WINDOW_TOPLEVEL,
! "mainwin", 770, 478);
! gtk_container_border_width(GTK_CONTAINER(mainwin), 0);
! gtk_signal_connect(GTK_OBJECT(mainwin), "destroy",
GTK_SIGNAL_FUNC(gq_exit),
! NULL);
! gtk_window_set_title(GTK_WINDOW(mainwin), _("GQ"));
! gtk_window_set_policy(GTK_WINDOW(mainwin), FALSE, TRUE, FALSE);
--- 184,200 ----
struct gq_filter *filter;
+ assert(win != NULL);
/* mainwin = gtk_window_new(GTK_WINDOW_TOPLEVEL); */
/* gtk_window_set_default_size(GTK_WINDOW(mainwin), 770, 478); */
! win->mainwin = stateful_gtk_window_new(GTK_WINDOW_TOPLEVEL,
! "mainwin", 770, 478);
! gtk_container_border_width(GTK_CONTAINER(win->mainwin), 0);
! gtk_signal_connect(GTK_OBJECT(win->mainwin), "destroy",
GTK_SIGNAL_FUNC(gq_exit),
! win);
! gtk_window_set_title(GTK_WINDOW(win->mainwin), _("GQ"));
! gtk_window_set_policy(GTK_WINDOW(win->mainwin), FALSE, TRUE, FALSE);
***************
*** 190,197 ****
gtk_container_border_width(GTK_CONTAINER(outer_vbox), 0);
gtk_widget_show(outer_vbox);
! gtk_container_add(GTK_CONTAINER(mainwin), outer_vbox);
main_vbox = gtk_vbox_new(FALSE, 2);
- gtk_object_set_data(GTK_OBJECT(mainwin), "main_vbox", main_vbox);
gtk_container_border_width(GTK_CONTAINER(main_vbox), 4);
gtk_widget_show(main_vbox);
--- 203,209 ----
gtk_container_border_width(GTK_CONTAINER(outer_vbox), 0);
gtk_widget_show(outer_vbox);
! gtk_container_add(GTK_CONTAINER(win->mainwin), outer_vbox);
main_vbox = gtk_vbox_new(FALSE, 2);
gtk_container_border_width(GTK_CONTAINER(main_vbox), 4);
gtk_widget_show(main_vbox);
***************
*** 201,207 ****
#if GTK_MAJOR < 2
! gtk_accel_group_attach(accel_group, GTK_OBJECT(mainwin));
#else
! gtk_window_add_accel_group(GTK_WINDOW(mainwin), accel_group);
#endif
--- 213,219 ----
#if GTK_MAJOR < 2
! gtk_accel_group_attach(accel_group, GTK_OBJECT(win->mainwin));
#else
! gtk_window_add_accel_group(GTK_WINDOW(win->mainwin), accel_group);
#endif
***************
*** 235,240 ****
gtk_menu_append(GTK_MENU(submenu), Search);
gtk_signal_connect_object(GTK_OBJECT(Search), "activate",
! GTK_SIGNAL_FUNC(new_modetab),
! GINT_TO_POINTER(SEARCH_MODE));
gtk_widget_add_accelerator(Search, "activate", accel_group, 'S',
GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
--- 247,252 ----
gtk_menu_append(GTK_MENU(submenu), Search);
gtk_signal_connect_object(GTK_OBJECT(Search), "activate",
! GTK_SIGNAL_FUNC(new_modetab_search),
! (gpointer) win);
gtk_widget_add_accelerator(Search, "activate", accel_group, 'S',
GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
***************
*** 245,255 ****
gtk_menu_append(GTK_MENU(submenu), Browse);
gtk_signal_connect_object(GTK_OBJECT(Browse), "activate",
! GTK_SIGNAL_FUNC(new_modetab),
! GINT_TO_POINTER(BROWSE_MODE));
gtk_widget_add_accelerator(Browse, "activate", accel_group, 'B',
GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
/* ctrl-b is used by text widgets, so the searchterm textbox that
always has focus in search mode blocks the above accelerator...*/
! gtk_signal_connect(GTK_OBJECT(mainwin), "key_press_event",
GTK_SIGNAL_FUNC(ctrl_b_hack),
(gpointer) Browse);
--- 257,267 ----
gtk_menu_append(GTK_MENU(submenu), Browse);
gtk_signal_connect_object(GTK_OBJECT(Browse), "activate",
! GTK_SIGNAL_FUNC(new_modetab_browse),
! (gpointer) win);
gtk_widget_add_accelerator(Browse, "activate", accel_group, 'B',
GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
/* ctrl-b is used by text widgets, so the searchterm textbox that
always has focus in search mode blocks the above accelerator...*/
! gtk_signal_connect(GTK_OBJECT(win->mainwin), "key_press_event",
GTK_SIGNAL_FUNC(ctrl_b_hack),
(gpointer) Browse);
***************
*** 263,268 ****
#ifdef HAVE_LDAP_STR2OBJECTCLASS
gtk_signal_connect_object(GTK_OBJECT(Schema), "activate",
! GTK_SIGNAL_FUNC(new_modetab),
! GINT_TO_POINTER(SCHEMA_MODE));
#else
gtk_widget_set_sensitive(Schema, FALSE);
--- 275,280 ----
#ifdef HAVE_LDAP_STR2OBJECTCLASS
gtk_signal_connect_object(GTK_OBJECT(Schema), "activate",
! GTK_SIGNAL_FUNC(new_modetab_schema),
! (gpointer) win);
#else
gtk_widget_set_sensitive(Schema, FALSE);
***************
*** 288,292 ****
GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
/* :-( */
! gtk_signal_connect(GTK_OBJECT(mainwin), "key_press_event",
GTK_SIGNAL_FUNC(ctrl_w_hack),
(gpointer) Close);
--- 300,304 ----
GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
/* :-( */
! gtk_signal_connect(GTK_OBJECT(win->mainwin), "key_press_event",
GTK_SIGNAL_FUNC(ctrl_w_hack),
(gpointer) Close);
***************
*** 298,302 ****
gtk_signal_connect_object(GTK_OBJECT(Quit), "activate",
GTK_SIGNAL_FUNC(gtk_widget_destroy),
! GTK_OBJECT(mainwin));
gtk_widget_add_accelerator(Quit, "activate", accel_group, 'Q',
GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
--- 310,314 ----
gtk_signal_connect_object(GTK_OBJECT(Quit), "activate",
GTK_SIGNAL_FUNC(gtk_widget_destroy),
! GTK_OBJECT(win->mainwin));
gtk_widget_add_accelerator(Quit, "activate", accel_group, 'Q',
GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
***************
*** 310,314 ****
menuFilters = gtk_menu_new();
gtk_menu_item_set_submenu(GTK_MENU_ITEM(Filters), menuFilters);
! gtk_object_set_data(GTK_OBJECT(mainwin), "filtermenu", menuFilters);
/* Filters | New */
--- 322,326 ----
menuFilters = gtk_menu_new();
gtk_menu_item_set_submenu(GTK_MENU_ITEM(Filters), menuFilters);
! mainwin.filtermenu = menuFilters;
/* Filters | New */
***************
*** 386,413 ****
GTK_SIGNAL_FUNC(create_about_window), NULL);
! mainbook = gtk_notebook_new();
! gtk_widget_show(mainbook);
/* GTK_WIDGET_UNSET_FLAGS(GTK_NOTEBOOK(mainbook), GTK_CAN_FOCUS); */
! gtk_box_pack_start(GTK_BOX(main_vbox), mainbook, TRUE, TRUE, 0);
! statusbar = gtk_statusbar_new();
! gtk_object_set_data(GTK_OBJECT(mainwin), "statusbar", statusbar);
! gtk_widget_show(statusbar);
! gtk_box_pack_end(GTK_BOX(main_vbox), statusbar, FALSE, FALSE, 5);
! gtk_widget_set_sensitive(statusbar, TRUE);
! new_modetab(SEARCH_MODE);
! new_modetab(BROWSE_MODE | 32768);
! new_modetab(SCHEMA_MODE | 32768);
! gtk_signal_connect(GTK_OBJECT(mainbook), "switch-page",
! GTK_SIGNAL_FUNC(switchpage_refocus), NULL);
! gtk_widget_show(mainwin);
}
! void new_modetab(int mode)
{
GtkWidget *content, *label, *focusbox;
--- 398,424 ----
GTK_SIGNAL_FUNC(create_about_window), NULL);
! win->mainbook = gtk_notebook_new();
! gtk_widget_show(win->mainbook);
/* GTK_WIDGET_UNSET_FLAGS(GTK_NOTEBOOK(mainbook), GTK_CAN_FOCUS); */
! gtk_box_pack_start(GTK_BOX(main_vbox), win->mainbook, TRUE, TRUE, 0);
! win->statusbar = gtk_statusbar_new();
! gtk_widget_show(win->statusbar);
! gtk_box_pack_end(GTK_BOX(main_vbox), win->statusbar, FALSE, FALSE, 5);
! gtk_widget_set_sensitive(win->statusbar, TRUE);
! new_modetab(win, SEARCH_MODE);
! new_modetab(win, BROWSE_MODE | 32768);
! new_modetab(win, SCHEMA_MODE | 32768);
! gtk_signal_connect(GTK_OBJECT(win->mainbook), "switch-page",
! GTK_SIGNAL_FUNC(switchpage_refocus), win);
! gtk_widget_show(win->mainwin);
}
! void new_modetab(struct mainwin_data *win, int mode)
{
GtkWidget *content, *label, *focusbox;
***************
*** 444,451 ****
enter_last_of_mode(tab);
gtk_widget_show(label);
! gtk_notebook_append_page(GTK_NOTEBOOK(mainbook), content, label);
if(focus) {
! gtk_notebook_set_page(GTK_NOTEBOOK(mainbook), -1);
focusbox = tab->focus;
--- 455,462 ----
enter_last_of_mode(tab);
gtk_widget_show(label);
! gtk_notebook_append_page(GTK_NOTEBOOK(win->mainbook), content, label);
if(focus) {
! gtk_notebook_set_page(GTK_NOTEBOOK(win->mainbook), -1);
focusbox = tab->focus;
***************
*** 454,458 ****
}
! tablist = g_list_append(tablist, tab);
}
--- 465,469 ----
}
! win->tablist = g_list_append(win->tablist, tab);
}
***************
*** 460,468 ****
void switchpage_refocus(GtkNotebook *notebook, GtkNotebookPage *page,
! int pagenum, gpointer data) {
GtkWidget *focusbox;
struct tab *tab;
! tab = g_list_nth_data(tablist, pagenum);
if(!tab)
return;
--- 471,479 ----
void switchpage_refocus(GtkNotebook *notebook, GtkNotebookPage *page,
! int pagenum, struct mainwin_data *win) {
GtkWidget *focusbox;
struct tab *tab;
! tab = g_list_nth_data(win->tablist, pagenum);
if(!tab)
return;
***************
*** 480,484 ****
! void cleanup_all_tabs(void)
{
GList *tabs;
--- 491,495 ----
! void cleanup_all_tabs(struct mainwin_data *win)
{
GList *tabs;
***************
*** 486,493 ****
/* don't waste time refocusing on disappearing tabs */
! gtk_signal_disconnect_by_func(GTK_OBJECT(mainbook),
GTK_SIGNAL_FUNC(switchpage_refocus), NULL);
! tabs = tablist;
while(tabs) {
tab = (struct tab *) tabs->data;
--- 497,504 ----
/* don't waste time refocusing on disappearing tabs */
! gtk_signal_disconnect_by_func(GTK_OBJECT(win->mainbook),
GTK_SIGNAL_FUNC(switchpage_refocus), NULL);
! tabs = win->tablist;
while(tabs) {
tab = (struct tab *) tabs->data;
***************
*** 500,504 ****
! void close_current_tab(void)
{
GList *tl;
--- 511,515 ----
! void close_current_tab(struct mainwin_data *win)
{
GList *tl;
***************
*** 507,512 ****
thismode = -1;
! tabnum = gtk_notebook_get_current_page(GTK_NOTEBOOK(mainbook));
! tab = g_list_nth_data(tablist, tabnum);
if(tab)
--- 518,523 ----
thismode = -1;
! tabnum = gtk_notebook_get_current_page(GTK_NOTEBOOK(win->mainbook));
! tab = g_list_nth_data(win->tablist, tabnum);
if(tab)
***************
*** 516,530 ****
free(tab->modeinfo);
free(tab);
! gtk_notebook_remove_page(GTK_NOTEBOOK(mainbook), tabnum);
! tablist = g_list_remove(tablist, tab);
! if(tablist == NULL)
! gtk_widget_destroy(mainwin);
! g_hash_table_insert(lastofmode, (gpointer) thismode, NULL);
/* try to find another tab with the same mode so we can put that
one into lastofmode... */
! for (tl = tablist; tl; tl = tl->next) {
if( ((struct tab *)(tl->data))->type == thismode) {
/* found one! */
--- 527,541 ----
free(tab->modeinfo);
free(tab);
! gtk_notebook_remove_page(GTK_NOTEBOOK(win->mainbook), tabnum);
! win->tablist = g_list_remove(win->tablist, tab);
! if(win->tablist == NULL)
! gtk_widget_destroy(win->mainwin);
! g_hash_table_insert(win->lastofmode, (gpointer) thismode, NULL);
/* try to find another tab with the same mode so we can put that
one into lastofmode... */
! for (tl = win->tablist; tl; tl = tl->next) {
if( ((struct tab *)(tl->data))->type == thismode) {
/* found one! */
***************
*** 557,566 ****
! void update_serverlist(void)
{
GList *tabs;
struct tab *tab;
! tabs = tablist;
while(tabs) {
tab = (struct tab *) tabs->data;
--- 568,577 ----
! void update_serverlist(struct mainwin_data *win)
{
GList *tabs;
struct tab *tab;
! tabs = win->tablist;
while(tabs) {
tab = (struct tab *) tabs->data;
***************
*** 586,593 ****
static void close_license_window(GtkWidget *window)
{
- license_window = NULL;
gtk_widget_destroy(window);
}
void create_license_window(void)
{
--- 597,609 ----
static void close_license_window(GtkWidget *window)
{
gtk_widget_destroy(window);
}
+ static void destroy_license_window(GtkWidget *window)
+ {
+ assert(window == license_window);
+ license_window = NULL;
+ }
+
void create_license_window(void)
{
***************
*** 611,616 ****
license_window = window = gtk_dialog_new();
! gtk_object_set_data(GTK_OBJECT(window), "close_func",
! close_license_window);
gtk_widget_set_usize(window, 540, 400);
gtk_window_set_title(GTK_WINDOW(window), _("License"));
--- 627,632 ----
license_window = window = gtk_dialog_new();
! /* gtk_object_set_data(GTK_OBJECT(window), "close_func", */
! /* close_license_window); */
gtk_widget_set_usize(window, 540, 400);
gtk_window_set_title(GTK_WINDOW(window), _("License"));
***************
*** 685,696 ****
GTK_WIDGET_SET_FLAGS(ok_button, GTK_CAN_DEFAULT);
gtk_widget_grab_default(ok_button);
! gtk_signal_connect_object(GTK_OBJECT(window), "delete_event",
! (GtkSignalFunc) close_license_window,
! GTK_OBJECT(window));
gtk_signal_connect_object(GTK_OBJECT(ok_button), "clicked",
(GtkSignalFunc) close_license_window,
GTK_OBJECT(window));
gtk_signal_connect_object(GTK_OBJECT(window), "key_press_event",
! (GtkSignalFunc) func_on_esc,
(gpointer) window);
--- 701,712 ----
GTK_WIDGET_SET_FLAGS(ok_button, GTK_CAN_DEFAULT);
gtk_widget_grab_default(ok_button);
! gtk_signal_connect(GTK_OBJECT(window), "destroy",
! (GtkSignalFunc) destroy_license_window,
! NULL);
gtk_signal_connect_object(GTK_OBJECT(ok_button), "clicked",
(GtkSignalFunc) close_license_window,
GTK_OBJECT(window));
gtk_signal_connect_object(GTK_OBJECT(window), "key_press_event",
! (GtkSignalFunc) close_on_esc,
(gpointer) window);
***************
*** 701,708 ****
static GtkWidget *about_window = NULL;
! static void close_about_window(GtkWidget *window)
{
about_window = NULL;
- gtk_widget_destroy(window);
}
--- 717,724 ----
static GtkWidget *about_window = NULL;
! static void destroy_about_window(GtkWidget *window)
{
+ assert(window == about_window);
about_window = NULL;
}
***************
*** 750,756 ****
snprintf(about_text, sizeof(about_text),
! "GQ %s\n\n\n%s", VERSION, about_blurb);
about_label = gtk_label_new(about_text);
! gtk_label_set_justify(GTK_LABEL(about_label), GTK_JUSTIFY_CENTER);
gtk_widget_show(about_label);
gtk_box_pack_start(GTK_BOX(hbox), about_label, FALSE, FALSE, 4);
--- 766,778 ----
snprintf(about_text, sizeof(about_text),
! "GQ %s\n\n\n%s\n\n"
! "GTK version %d.%d.%d\n"
! "GLib version %d.%d.%d\n",
! VERSION, about_blurb,
! gtk_major_version, gtk_minor_version, gtk_micro_version,
! glib_major_version, glib_minor_version, glib_micro_version);
!
about_label = gtk_label_new(about_text);
! gtk_label_set_justify(GTK_LABEL(about_label), GTK_JUSTIFY_LEFT);
gtk_widget_show(about_label);
gtk_box_pack_start(GTK_BOX(hbox), about_label, FALSE, FALSE, 4);
***************
*** 784,790 ****
GTK_SIGNAL_FUNC(close_on_esc), (gpointer) about_window);
! gtk_signal_connect_object(GTK_OBJECT(about_window), "delete_event",
! (GtkSignalFunc) close_about_window,
! GTK_OBJECT(about_window));
gtk_widget_show(about_window);
--- 806,812 ----
GTK_SIGNAL_FUNC(close_on_esc), (gpointer) about_window);
! gtk_signal_connect(GTK_OBJECT(about_window), "destroy",
! (GtkSignalFunc) destroy_about_window,
! NULL);
gtk_widget_show(about_window);
Index: mainwin.h
===================================================================
RCS file: /cvsroot/gqclient/gq/src/mainwin.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** mainwin.h 9 Oct 2003 05:42:50 -0000 1.18
--- mainwin.h 9 Oct 2003 05:47:26 -0000 1.19
***************
*** 39,47 ****
"http://biot.com/gq/\n"
! extern GList *tablist;
! extern GtkWidget *mainwin;
! extern GtkWidget *mainbook;
! extern GtkWidget *statusbar;
struct tab *get_last_of_mode(int mode);
--- 39,52 ----
"http://biot.com/gq/\n"
+ struct mainwin_data {
+ GList *tablist;
+ GtkWidget *mainwin;
+ GtkWidget *mainbook;
+ GtkWidget *statusbar;
+ GtkWidget *filtermenu;
+ GHashTable *lastofmode;
+ };
! extern struct mainwin_data mainwin;
struct tab *get_last_of_mode(int mode);
***************
*** 50,63 ****
void fill_serverlist_combo(GtkWidget *combo);
! void cleanup(void);
! void gq_exit(GtkWidget *widget, gpointer *data);
! void create_mainwin(void);
! void new_modetab(int mode);
void switchpage_refocus(GtkNotebook *notebook, GtkNotebookPage *page,
! int pagenum, gpointer data);
! void cleanup_all_tabs(void);
! void close_current_tab(void);
void cleanup_tab(struct tab *tab);
! void update_serverlist(void);
void create_license_window(void);
/* void close_license_window(GtkWidget *widget); */
--- 55,68 ----
void fill_serverlist_combo(GtkWidget *combo);
! void cleanup(struct mainwin_data *win);
! void gq_exit(GtkWidget *widget, struct mainwin_data *win);
! void create_mainwin(struct mainwin_data *);
! void new_modetab(struct mainwin_data *, int mode);
void switchpage_refocus(GtkNotebook *notebook, GtkNotebookPage *page,
! int pagenum, struct mainwin_data *win);
! void cleanup_all_tabs(struct mainwin_data *win);
! void close_current_tab(struct mainwin_data *win);
void cleanup_tab(struct tab *tab);
! void update_serverlist(struct mainwin_data *win);
void create_license_window(void);
/* void close_license_window(GtkWidget *widget); */
Index: prefs.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/prefs.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** prefs.c 9 Oct 2003 05:15:06 -0000 1.36
--- prefs.c 9 Oct 2003 05:47:26 -0000 1.37
***************
*** 258,262 ****
/* so the cancel button doesn't really cancel :-) */
save_config();
! update_serverlist();
if (cb_data->edit_new_server) {
--- 258,262 ----
/* so the cancel button doesn't really cancel :-) */
save_config();
! update_serverlist(&mainwin);
if (cb_data->edit_new_server) {
***************
*** 943,947 ****
fill_serverlist_serverstab();
! update_serverlist();
}
}
--- 943,947 ----
fill_serverlist_serverstab();
! update_serverlist(&mainwin);
}
}
Index: util.c
===================================================================
RCS file: /cvsroot/gqclient/gq/src/util.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** util.c 9 Oct 2003 05:38:58 -0000 1.66
--- util.c 9 Oct 2003 05:47:26 -0000 1.67
***************
*** 562,566 ****
busycursor = gdk_cursor_new(GDK_WATCH);
! gdk_window_set_cursor(mainwin->window, busycursor);
gdk_cursor_destroy(busycursor);
--- 562,566 ----
busycursor = gdk_cursor_new(GDK_WATCH);
! gdk_window_set_cursor(mainwin.mainwin->window, busycursor);
gdk_cursor_destroy(busycursor);
***************
*** 574,578 ****
{
! gdk_window_set_cursor(mainwin->window, NULL);
}
--- 574,578 ----
{
! gdk_window_set_cursor(mainwin.mainwin->window, NULL);
}
***************
*** 702,705 ****
--- 702,706 ----
+ /* these should probably belong to struct mainwin_data */
static guint context = 0, msgid = 0;
***************
*** 940,946 ****
gtk_widget_show(hbox1);
gtk_box_pack_start(GTK_BOX(vbox1), hbox1, FALSE, FALSE, 10);
! warning = gdk_pixmap_create_from_xpm_d(GTK_WIDGET(mainwin)->window,
&warning_mask,
! &mainwin->style->white,
warning_xpm);
pixmap = gtk_pixmap_new(warning, warning_mask);
--- 941,947 ----
gtk_widget_show(hbox1);
gtk_box_pack_start(GTK_BOX(vbox1), hbox1, FALSE, FALSE, 10);
! warning = gdk_pixmap_create_from_xpm_d(GTK_WIDGET(mainwin.mainwin)->window,
&warning_mask,
! &mainwin.mainwin->style->white,
warning_xpm);
pixmap = gtk_pixmap_new(warning, warning_mask);
|
|
From: <sta...@us...> - 2003-10-09 05:42:53
|
Update of /cvsroot/gqclient/gq/src In directory sc8-pr-cvs1:/tmp/cvs-serv8959 Modified Files: mainwin.h Log Message: * Changed the about blurb (again) - mostly cosmetic Index: mainwin.h =================================================================== RCS file: /cvsroot/gqclient/gq/src/mainwin.h,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** mainwin.h 30 Sep 2003 17:20:25 -0000 1.17 --- mainwin.h 9 Oct 2003 05:42:50 -0000 1.18 *************** *** 33,41 **** #define PACKAGEVERSION PACKAGE " " VERSION ! #define about_blurb "The gentleman's LDAP client" \ ! "\n\n(c) 1998-2003 Bert Vermeulen <be...@bi...>" \ ! "\nand" \ ! "\n(c) 2002-2003 Peter Stamfest <pe...@st...>" \ ! "\n\nhttp://biot.com/gq/" --- 33,41 ---- #define PACKAGEVERSION PACKAGE " " VERSION ! #define about_blurb "The gentleman's LDAP client\n\n" \ ! "(c) 1998-2003 Bert Vermeulen <be...@bi...>\n" \ ! "(c) 2002-2003 Peter Stamfest <pe...@st...>\n\n" \ ! "For license terms please see the license window\n\n" \ ! "http://biot.com/gq/\n" |
