/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001 Match Grun
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 2001-2015 Match Grun and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/*
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#ifdef USE_LDAP
#include "defs.h"
#include <glib.h>
+#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkbutton.h>
-
-#include "intl.h"
+#include <gtk/gtk.h>
+
#include "prefs_common.h"
-#include "syldap.h"
+#include "ldaputil.h"
#include "mgutils.h"
#include "gtkutils.h"
#include "manage_window.h"
return TRUE;
}
-static void edit_ldap_bdn_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled ) {
- if (event && event->keyval == GDK_Escape) {
+static gboolean edit_ldap_bdn_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled ) {
+ if (event && event->keyval == GDK_KEY_Escape) {
ldapedit_basedn_cancelled = TRUE;
gtk_main_quit();
}
+ return FALSE;
}
static void edit_ldap_bdn_ok( GtkWidget *widget, gboolean *cancelled ) {
gtk_main_quit();
}
-static void edit_ldap_bdn_list_select( GtkCList *clist, gint row, gint column, GdkEvent *event, gpointer data ) {
- gchar **text = NULL;
- if( gtk_clist_get_text( clist, row, 0, text ) ) {
- if( *text ) {
- gtk_entry_set_text(GTK_ENTRY(ldapedit_basedn.basedn_entry), *text );
- }
- }
+static void set_selected()
+{
+ GtkWidget *entry = ldapedit_basedn.basedn_entry;
+ GtkWidget *view = ldapedit_basedn.basedn_list;
+ gchar *text;
+
+ if (entry == NULL || view == NULL)
+ return;
+
+ text = gtkut_tree_view_get_selected_pointer(
+ GTK_TREE_VIEW(view), 0, NULL, NULL, NULL);
+
+ if (text == NULL)
+ return;
+
+ gtk_entry_set_text(GTK_ENTRY(entry), text);
+ g_free(text);
}
-static void edit_ldap_bdn_list_button( GtkCList *clist, GdkEventButton *event, gpointer data ) {
- if( ! event ) return;
- if( event->button == 1 ) {
- if( event->type == GDK_2BUTTON_PRESS ) {
- ldapedit_basedn_cancelled = FALSE;
- gtk_main_quit();
- }
- }
+static void basedn_list_cursor_changed(GtkTreeView *view,
+ gpointer user_data)
+{
+ set_selected();
+}
+
+static void basedn_list_row_activated(GtkTreeView *view,
+ GtkTreePath *path,
+ GtkTreeViewColumn *column,
+ gpointer user_data)
+{
+ set_selected();
+ edit_ldap_bdn_ok(NULL, NULL);
}
static void edit_ldap_bdn_create(void) {
GtkWidget *label;
GtkWidget *host_label;
GtkWidget *port_label;
- //GtkWidget *basedn_label;
GtkWidget *basedn_list;
GtkWidget *vlbox;
GtkWidget *lwindow;
GtkWidget *basedn_entry;
- //GtkWidget *hlbox;
GtkWidget *hbbox;
GtkWidget *hsep;
GtkWidget *ok_btn;
GtkWidget *cancel_btn;
- //GtkWidget *check_btn;
- //GtkWidget *file_btn;
GtkWidget *hsbox;
GtkWidget *statusbar;
gint top;
+ GtkListStore *store;
+ GtkTreeSelection *sel;
+ GtkTreeViewColumn *col;
+ GtkCellRenderer *rdr;
- window = gtk_window_new(GTK_WINDOW_DIALOG);
- gtk_widget_set_usize(window, 300, 270);
+ window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "editldap_basedn");
gtk_container_set_border_width(GTK_CONTAINER(window), 0);
gtk_window_set_title(GTK_WINDOW(window), _("Edit LDAP - Select Search Base"));
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
- gtk_window_set_modal(GTK_WINDOW(window), TRUE);
- gtk_signal_connect(GTK_OBJECT(window), "delete_event",
- GTK_SIGNAL_FUNC(edit_ldap_bdn_delete_event), NULL );
- gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
- GTK_SIGNAL_FUNC(edit_ldap_bdn_key_pressed), NULL );
+ gtk_window_set_type_hint(GTK_WINDOW(window), GDK_WINDOW_TYPE_HINT_DIALOG);
+ g_signal_connect(G_OBJECT(window), "delete_event",
+ G_CALLBACK(edit_ldap_bdn_delete_event), NULL );
+ g_signal_connect(G_OBJECT(window), "key_press_event",
+ G_CALLBACK(edit_ldap_bdn_key_pressed), NULL );
vbox = gtk_vbox_new(FALSE, 8);
gtk_container_add(GTK_CONTAINER(window), vbox);
gtk_table_set_row_spacings(GTK_TABLE(table), 8);
gtk_table_set_col_spacings(GTK_TABLE(table), 8);
- // First row
+ /* First row */
top = 0;
label = gtk_label_new(_("Hostname"));
gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
gtk_table_attach(GTK_TABLE(table), host_label, 1, 2, top, (top + 1), GTK_FILL, 0, 0, 0);
gtk_misc_set_alignment(GTK_MISC(host_label), 0, 0.5);
- // Second row
+ /* Second row */
top = 1;
label = gtk_label_new(_("Port"));
gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
gtk_table_attach(GTK_TABLE(table), port_label, 1, 2, top, (top + 1), GTK_FILL, 0, 0, 0);
gtk_misc_set_alignment(GTK_MISC(port_label), 0, 0.5);
- // Third row
+ /* Third row */
top = 2;
label = gtk_label_new(_("Search Base"));
gtk_table_attach(GTK_TABLE(table), label, 0, 1, top, (top + 1), GTK_FILL, 0, 0, 0);
basedn_entry = gtk_entry_new();
gtk_table_attach(GTK_TABLE(table), basedn_entry, 1, 2, top, (top + 1), GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
- // Basedn list
+ /* Basedn list */
vlbox = gtk_vbox_new(FALSE, 8);
gtk_box_pack_start(GTK_BOX(vbox), vlbox, TRUE, TRUE, 0);
gtk_container_set_border_width( GTK_CONTAINER(vlbox), 8 );
lwindow = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(lwindow),
GTK_POLICY_AUTOMATIC,
- GTK_POLICY_ALWAYS);
+ GTK_POLICY_AUTOMATIC);
gtk_box_pack_start(GTK_BOX(vlbox), lwindow, TRUE, TRUE, 0);
- basedn_list = gtk_clist_new(1);
+ store = gtk_list_store_new(1, G_TYPE_STRING, -1);
+
+ basedn_list = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
+ g_object_unref(store);
+ gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(basedn_list), TRUE);
+ sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(basedn_list));
+ gtk_tree_selection_set_mode(sel, GTK_SELECTION_BROWSE);
+
+ rdr = gtk_cell_renderer_text_new();
+ col = gtk_tree_view_column_new_with_attributes(
+ _("Available Search Base(s)"), rdr,
+ "markup", 0, NULL);
+ gtk_tree_view_append_column(GTK_TREE_VIEW(basedn_list), col);
+
gtk_container_add(GTK_CONTAINER(lwindow), basedn_list);
- gtk_clist_column_titles_show( GTK_CLIST(basedn_list) );
- gtk_clist_set_column_title( GTK_CLIST(basedn_list), 0, _( "Available Search Base(s)" ) );
- gtk_clist_set_selection_mode(GTK_CLIST(basedn_list), GTK_SELECTION_BROWSE);
- // Status line
+ g_signal_connect(G_OBJECT(basedn_list), "cursor-changed",
+ G_CALLBACK(basedn_list_cursor_changed), NULL);
+ g_signal_connect(G_OBJECT(basedn_list), "row-activated",
+ G_CALLBACK(basedn_list_row_activated), NULL);
+
+
+ /* Status line */
hsbox = gtk_hbox_new(FALSE, 0);
gtk_box_pack_end(GTK_BOX(vbox), hsbox, FALSE, FALSE, BORDER_WIDTH);
statusbar = gtk_statusbar_new();
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
- // Button panel
- gtkut_button_set_create(&hbbox, &ok_btn, _("OK"),
- &cancel_btn, _("Cancel"), NULL, NULL);
+ /* Button panel */
+ gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
+ &cancel_btn, GTK_STOCK_CANCEL,
+ NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
gtk_container_set_border_width( GTK_CONTAINER(hbbox), 0 );
gtk_widget_grab_default(ok_btn);
hsep = gtk_hseparator_new();
gtk_box_pack_end(GTK_BOX(vbox), hsep, FALSE, FALSE, 0);
- gtk_signal_connect(GTK_OBJECT(ok_btn), "clicked",
- GTK_SIGNAL_FUNC(edit_ldap_bdn_ok), NULL);
- gtk_signal_connect(GTK_OBJECT(cancel_btn), "clicked",
- GTK_SIGNAL_FUNC(edit_ldap_bdn_cancel), NULL);
- gtk_signal_connect(GTK_OBJECT(basedn_list), "select_row",
- GTK_SIGNAL_FUNC(edit_ldap_bdn_list_select), NULL);
- gtk_signal_connect(GTK_OBJECT(basedn_list), "button_press_event",
- GTK_SIGNAL_FUNC(edit_ldap_bdn_list_button), NULL);
+ g_signal_connect(G_OBJECT(ok_btn), "clicked",
+ G_CALLBACK(edit_ldap_bdn_ok), NULL);
+ g_signal_connect(G_OBJECT(cancel_btn), "clicked",
+ G_CALLBACK(edit_ldap_bdn_cancel), NULL);
gtk_widget_show_all(vbox);
ldapedit_basedn.ok_btn = ok_btn;
ldapedit_basedn.cancel_btn = cancel_btn;
ldapedit_basedn.statusbar = statusbar;
- ldapedit_basedn.status_cid = gtk_statusbar_get_context_id( GTK_STATUSBAR(statusbar), "Edit LDAP Select Base DN" );
+ ldapedit_basedn.status_cid =
+ gtk_statusbar_get_context_id(
+ GTK_STATUSBAR(statusbar), "Edit LDAP Select Base DN" );
}
-void edit_ldap_bdn_load_data( const gchar *hostName, const gint iPort, const gint tov, const gchar* bindDN,
- const gchar *bindPW ) {
+static void edit_ldap_bdn_load_data(
+ const gchar *hostName, const gint iPort, const gint tov,
+ const gchar* bindDN, const gchar *bindPW, int ssl, int tls )
+{
gchar *sHost;
gchar *sMsg = NULL;
gchar sPort[20];
gboolean flgConn;
gboolean flgDN;
+ GList *baseDN = NULL;
+ GtkWidget *view = ldapedit_basedn.basedn_list;
+ GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(view));
+ GtkTreeIter iter;
+ GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(view));
edit_ldap_bdn_status_show( "" );
- gtk_clist_clear(GTK_CLIST(ldapedit_basedn.basedn_list));
+
+ gtk_list_store_clear(GTK_LIST_STORE(model));
+
ldapedit_basedn_bad_server = TRUE;
flgConn = flgDN = FALSE;
sHost = g_strdup( hostName );
gtk_label_set_text(GTK_LABEL(ldapedit_basedn.host_label), hostName);
gtk_label_set_text(GTK_LABEL(ldapedit_basedn.port_label), sPort);
if( *sHost != '\0' ) {
- // Test connection to server
- if( syldap_test_connect_s( sHost, iPort ) ) {
- // Attempt to read base DN
- GList *baseDN = syldap_read_basedn_s( sHost, iPort, bindDN, bindPW, tov );
+ /* Test connection to server */
+ if( ldaputil_test_connect( sHost, iPort, ssl, tls, tov ) ) {
+ /* Attempt to read base DN */
+ baseDN = ldaputil_read_basedn( sHost, iPort, bindDN, bindPW, tov, ssl, tls );
if( baseDN ) {
GList *node = baseDN;
- gchar *sBase[2];
- sBase[1] = NULL;
+
while( node ) {
- sBase[0] = g_strdup( node->data );
- gtk_clist_append(GTK_CLIST(ldapedit_basedn.basedn_list), sBase);
+ gtk_list_store_append(GTK_LIST_STORE(model), &iter);
+ gtk_list_store_set(GTK_LIST_STORE(model), &iter,
+ 0, (gchar *)node->data, -1);
node = g_list_next( node );
flgDN = TRUE;
}
- mgu_free_dlist( baseDN );
+
+ /* Select the first line */
+ if (gtk_tree_model_get_iter_first(model, &iter))
+ gtk_tree_selection_select_iter(sel, &iter);
+
+ g_list_free_full( baseDN, g_free );
baseDN = node = NULL;
- sBase[0] = NULL;
}
ldapedit_basedn_bad_server = FALSE;
flgConn = TRUE;
}
g_free( sHost );
- // Display appropriate message
+ /* Display appropriate message */
if( flgConn ) {
if( ! flgDN ) {
sMsg = _( "Could not read Search Base(s) from server - please set manually" );
}
gchar *edit_ldap_basedn_selection( const gchar *hostName, const gint port, gchar *baseDN, const gint tov,
- const gchar* bindDN, const gchar *bindPW ) {
+ const gchar* bindDN, const gchar *bindPW, int ssl, int tls ) {
gchar *retVal = NULL;
ldapedit_basedn_cancelled = FALSE;
gtk_widget_grab_focus(ldapedit_basedn.ok_btn);
gtk_widget_show(ldapedit_basedn.window);
manage_window_set_transient(GTK_WINDOW(ldapedit_basedn.window));
-
+ gtk_window_set_modal(GTK_WINDOW(ldapedit_basedn.window), TRUE);
edit_ldap_bdn_status_show( "" );
- edit_ldap_bdn_load_data( hostName, port, tov, bindDN, bindPW );
+ edit_ldap_bdn_load_data( hostName, port, tov, bindDN, bindPW, ssl, tls );
gtk_widget_show(ldapedit_basedn.window);
-// sprintf( sPort, "%d", port );
-// gtk_label_set_text(GTK_LABEL(ldapedit_basedn.host_label), hostName);
-// gtk_label_set_text(GTK_LABEL(ldapedit_basedn.port_label), sPort);
gtk_entry_set_text(GTK_ENTRY(ldapedit_basedn.basedn_entry), baseDN);
gtk_main();
gtk_widget_hide(ldapedit_basedn.window);
+ gtk_window_set_modal(GTK_WINDOW(ldapedit_basedn.window), FALSE);
if( ldapedit_basedn_cancelled ) return NULL;
-// if( cancelled == TRUE ) return NULL;
if( ldapedit_basedn_bad_server ) return NULL;
- retVal = g_strdup( gtk_editable_get_chars( GTK_EDITABLE(ldapedit_basedn.basedn_entry), 0, -1 ) );
- g_strchomp( retVal ); g_strchug( retVal );
+ retVal = gtk_editable_get_chars( GTK_EDITABLE(ldapedit_basedn.basedn_entry), 0, -1 );
+ g_strstrip( retVal );
if( *retVal == '\0' ) {
g_free( retVal );
retVal = NULL;
projects / claws.git / blobdiff