[Pkg-samba-maint] r2872 - in trunk/samba-gtk: common debian tools

[jelmer at alioth.debian.org]

Author: jelmer
Date: 2009-06-19 16:38:26 +0000 (Fri, 19 Jun 2009)
New Revision: 2872

Modified:
   trunk/samba-gtk/common/select.c
   trunk/samba-gtk/common/select.h
   trunk/samba-gtk/debian/changelog
   trunk/samba-gtk/tools/gwcrontab.c
   trunk/samba-gtk/tools/gwsam.c
   trunk/samba-gtk/tools/gwsvcctl.c
Log:
Merge fix for connects.

Modified: trunk/samba-gtk/common/select.c
===================================================================
--- trunk/samba-gtk/common/select.c	2009-06-19 16:10:37 UTC (rev 2871)
+++ trunk/samba-gtk/common/select.c	2009-06-19 16:38:26 UTC (rev 2872)
@@ -277,6 +277,7 @@
  * for information not specified
  */
 struct dcerpc_pipe *gtk_connect_rpc_interface(TALLOC_CTX *mem_ctx, 
+						  struct tevent_context *ev_ctx,
 					      struct loadparm_context *lp_ctx,
 					      const struct ndr_interface_table *table)
 {
@@ -300,7 +301,7 @@
 
 	status = dcerpc_pipe_connect_b(mem_ctx, &pipe,
 				       gtk_rpc_binding_dialog_get_binding(d, mem_ctx),
-				       table, cred, NULL, lp_ctx);
+				       table, cred, ev_ctx, lp_ctx);
 
 	if(!NT_STATUS_IS_OK(status)) {
 		gtk_show_ntstatus(NULL, "While connecting to interface", status);

Modified: trunk/samba-gtk/common/select.h
===================================================================
--- trunk/samba-gtk/common/select.h	2009-06-19 16:10:37 UTC (rev 2871)
+++ trunk/samba-gtk/common/select.h	2009-06-19 16:38:26 UTC (rev 2872)
@@ -81,7 +81,8 @@
 struct ndr_interface_table;
 struct loadparm_context;
 struct dcerpc_pipe *gtk_connect_rpc_interface(TALLOC_CTX *mem_ctx, 
-					      struct loadparm_context *lp_ctx,
-					      const struct ndr_interface_table *table);
+											  struct tevent_context *ev_ctx,
+											  struct loadparm_context *lp_ctx,
+											  const struct ndr_interface_table *table);
 
 #endif

Modified: trunk/samba-gtk/debian/changelog
===================================================================
--- trunk/samba-gtk/debian/changelog	2009-06-19 16:10:37 UTC (rev 2871)
+++ trunk/samba-gtk/debian/changelog	2009-06-19 16:38:26 UTC (rev 2872)
@@ -1,4 +1,4 @@
-samba-gtk (0.0.1~bzr61-1) experimental; urgency=low
+samba-gtk (0.0.1~bzr62-1) experimental; urgency=low
 
   * Initial release. (Closes: #413822)
 

Modified: trunk/samba-gtk/tools/gwcrontab.c
===================================================================
--- trunk/samba-gtk/tools/gwcrontab.c	2009-06-19 16:10:37 UTC (rev 2871)
+++ trunk/samba-gtk/tools/gwcrontab.c	2009-06-19 16:38:26 UTC (rev 2872)
@@ -40,6 +40,7 @@
 static GtkWidget *entry_repeat_monthly;
 static GtkWidget *delete;
 struct loadparm_context *lp_ctx = NULL;
+struct tevent_context *ev_ctx;
 
 static void update_joblist(void)
 {
@@ -88,7 +89,8 @@
 
 static void on_connect_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
-	at_pipe = gtk_connect_rpc_interface(talloc_autofree_context(), lp_ctx, &ndr_table_atsvc);
+	at_pipe = gtk_connect_rpc_interface(talloc_autofree_context(), ev_ctx, 
+										lp_ctx, &ndr_table_atsvc);
 
 	if (!at_pipe)
 		return;
@@ -462,6 +464,7 @@
 
 	dcerpc_init(lp_ctx);
 
+	ev_ctx = tevent_context_init(lp_ctx);
 	gtk_init(&argc, &argv);
 	mainwin = create_mainwindow();
 	gtk_widget_show_all(mainwin);

Modified: trunk/samba-gtk/tools/gwsam.c
===================================================================
--- trunk/samba-gtk/tools/gwsam.c	2009-06-19 16:10:37 UTC (rev 2871)
+++ trunk/samba-gtk/tools/gwsam.c	2009-06-19 16:38:26 UTC (rev 2872)
@@ -39,6 +39,7 @@
 GtkListStore *store_groups;
 static GtkWidget *mnu_disconnect;
 struct loadparm_context *lp_ctx;
+struct tevent_context *ev_ctx;
 
 static void update_grouplist(void)
 {
@@ -132,7 +133,8 @@
 
 	mem_ctx = talloc_init("gwsam_connect");
 
-	sam_pipe = gtk_connect_rpc_interface(talloc_autofree_context(), lp_ctx, &ndr_table_samr);
+	sam_pipe = gtk_connect_rpc_interface(talloc_autofree_context(), ev_ctx, 
+										 lp_ctx, &ndr_table_samr);
 
 	if (!sam_pipe)
 		return;
@@ -446,6 +448,7 @@
 
 	dcerpc_init(lp_ctx);
 
+	ev_ctx = tevent_context_init(lp_ctx);
 	gtk_init(&argc, &argv);
 	mainwin = create_mainwindow();
 	gtk_widget_show_all(mainwin);

Modified: trunk/samba-gtk/tools/gwsvcctl.c
===================================================================
--- trunk/samba-gtk/tools/gwsvcctl.c	2009-06-19 16:10:37 UTC (rev 2871)
+++ trunk/samba-gtk/tools/gwsvcctl.c	2009-06-19 16:38:26 UTC (rev 2872)
@@ -30,6 +30,7 @@
 #include <samba/popt.h>
 #include <param.h>
 #include <util/debug.h>
+#include <tevent.h>
 
 static struct dcerpc_pipe *svcctl_pipe = NULL;
 static GtkWidget *mainwin;
@@ -37,12 +38,13 @@
 static GtkWidget *services;
 static GtkWidget *new_service, *delete_service, *edit_service, *start_service, *stop_service;
 static struct loadparm_context *lp_ctx = NULL;
+static struct tevent_context *ev_ctx = NULL;
 
 static void on_connect_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
 	TALLOC_CTX *mem_ctx = talloc_init("gwsvcctl_connect");
 
-	svcctl_pipe = gtk_connect_rpc_interface(mem_ctx, lp_ctx, &ndr_table_svcctl);
+	svcctl_pipe = gtk_connect_rpc_interface(mem_ctx, ev_ctx, lp_ctx, &ndr_table_svcctl);
 	if (svcctl_pipe == NULL)
 		return;
 
@@ -217,6 +219,7 @@
 
 	dcerpc_init(lp_ctx);
 
+	ev_ctx = tevent_context_init(lp_ctx);
 	gtk_init(&argc, &argv);
 	mainwin = create_mainwindow();
 	gtk_widget_show_all(mainwin);