summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcvs2git2004-04-13 14:39:04 (GMT)
committercvs2git2012-06-24 12:13:13 (GMT)
commitf68a82439f95141bb3234315e8bffd37279df407 (patch)
tree874f8cc35b4e4bb7c9a527402a586ab99902cb4e
parent21369742543f7e5c6dd1c914943cbdf03fe4378f (diff)
downloadgq-f68a82439f95141bb3234315e8bffd37279df407.zip
gq-f68a82439f95141bb3234315e8bffd37279df407.tar.gz
This commit was manufactured by cvs2git to create branch 'DEVEL'.
Sprout from master 2004-04-13 14:39:04 UTC Adam Gołębiowski <adamg@pld-linux.org> '- release 4 to rebuild with new openldap' Delete: gq-init.patch gq-passwd.patch
-rw-r--r--gq-init.patch29
-rw-r--r--gq-passwd.patch70
2 files changed, 0 insertions, 99 deletions
diff --git a/gq-init.patch b/gq-init.patch
deleted file mode 100644
index b782fe8..0000000
--- a/gq-init.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- gq-0.3.0/src/schemabrowse.c Fri Nov 10 17:39:19 2000
-+++ gq-0.3.0/src/schemabrowse.c Fri Nov 10 17:39:49 2000
-@@ -1612,7 +1612,7 @@
- GdkEventButton *event, gpointer data)
- {
- GList *list;
-- LDAPObjectClass *oc;
-+ LDAPObjectClass *oc = NULL;
- struct ldapserver *server;
- char *ocname;
-
-@@ -1648,7 +1648,7 @@
- GdkEventButton *event, gpointer data)
- {
- GList *list;
-- LDAPAttributeType *at;
-+ LDAPAttributeType *at = NULL;
- struct ldapserver *server;
- char *attrname;
-
-@@ -1684,7 +1684,7 @@
- GdkEventButton *event, gpointer data)
- {
- GList *list;
-- LDAPMatchingRule *mr;
-+ LDAPMatchingRule *mr = NULL;
- struct ldapserver *server;
- char *mrname;
-
diff --git a/gq-passwd.patch b/gq-passwd.patch
deleted file mode 100644
index 8113d67..0000000
--- a/gq-passwd.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -durN gq-0.6.0beta2.orig/src/prefs.c gq-0.6.0beta2/src/prefs.c
---- gq-0.6.0beta2.orig/src/prefs.c Wed Jun 19 00:07:14 2002
-+++ gq-0.6.0beta2/src/prefs.c Fri Jun 28 11:15:40 2002
-@@ -396,6 +396,7 @@
- GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-
- entry = gtk_entry_new();
-+ gtk_entry_set_visibility(GTK_ENTRY(entry),FALSE);
- gtk_object_set_data(GTK_OBJECT(editwindow), "bindpw", entry);
- gtk_entry_set_text(GTK_ENTRY(entry), server->bindpw);
- gtk_widget_show(entry);
-diff -durN gq-0.6.0beta2.orig/src/util.c gq-0.6.0beta2/src/util.c
---- gq-0.6.0beta2.orig/src/util.c Tue Jun 18 23:52:42 2002
-+++ gq-0.6.0beta2/src/util.c Fri Jun 28 11:15:15 2002
-@@ -153,11 +153,12 @@
-
- if(server->binddn[0]) {
- binddn = server->binddn;
-- bindpw = server->bindpw;
-- }
-- else if (server->enteredpw[0]) {
-- binddn = server->binddn;
-- bindpw = server->enteredpw;
-+ if (server->enteredpw[0]) {
-+ bindpw = server->enteredpw;
-+ }
-+ else{
-+ bindpw = server->bindpw;
-+ }
- } else {
- binddn = NULL;
- bindpw = NULL;
-@@ -257,7 +258,7 @@
- snprintf(message, sizeof(message),
- _("Password for server %s"), server->ldaphost);
-
-- if (query_popup(message, &ret)) {
-+ if (query_popup(message, &ret,0)) {
- if (ret) {
- strncpy(server->enteredpw, ret,
- sizeof(server->enteredpw) - 1);
-@@ -1134,7 +1135,7 @@
- /* pops up a dialog to retrieve user data via a GtkEntry. This
- functions waits for the data and puts it into outbuf. */
-
--int query_popup(const char *title, gchar **outbuf)
-+int query_popup(const char *title, gchar **outbuf,int visible)
- {
- GtkWidget *window, *vbox1, *vbox2, *label, *inputbox, *button, *hbox0;
- int rc;
-@@ -1176,6 +1177,7 @@
-
- inputbox = gtk_entry_new();
-
-+ gtk_entry_set_visibility(GTK_ENTRY(inputbox),visible);
- GTK_WIDGET_SET_FLAGS(inputbox, GTK_CAN_FOCUS);
- GTK_WIDGET_SET_FLAGS(inputbox, GTK_CAN_DEFAULT);
- gtk_widget_show(inputbox);
-diff -durN gq-0.6.0beta2.orig/src/util.h gq-0.6.0beta2/src/util.h
---- gq-0.6.0beta2.orig/src/util.h Wed Jun 19 00:07:14 2002
-+++ gq-0.6.0beta2/src/util.h Fri Jun 28 11:15:15 2002
-@@ -67,7 +67,7 @@
- struct gq_template *find_template_by_name(char *templatename);
- void dump_mods(LDAPMod **mods);
- const char *find_s_by_at_oid(struct ldapserver *server, const char *oid);
--int query_popup(const char *title, gchar **outbuf);
-+int query_popup(const char *title, gchar **outbuf,int visible);
- int question_popup(const char *title, const char *question);
-
- GList *get_suffixes(struct ldapserver *server);