network-manager-applet r776 - in trunk: . src

[dcbw svn gnome org]

Author: dcbw
Date: Thu Jul  3 12:55:56 2008
New Revision: 776
URL: http://svn.gnome.org/viewvc/network-manager-applet?rev=776&view=rev

Log:
2008-07-03  Dan Williams  <dcbw redhat com>

	* src/vpn-password-dialog.c
	  src/Makefile.am
		- (find_auth_dialog_binary): expect VPN auth dialog to be in $LIBEXECDIR



Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am
   trunk/src/vpn-password-dialog.c

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Thu Jul  3 12:55:56 2008
@@ -11,6 +11,7 @@
 	-DGLADEDIR=\""$(gladedir)"\"							\
 	-DBINDIR=\""$(bindir)"\"								\
 	-DSYSCONFDIR=\""$(sysconfdir)"\"						\
+	-DLIBEXECDIR=\""$(libexecdir)"\" \
 	-DAUTOSTARTDIR=\""$(sysconfdir)/xdg/autostart"\"			\
 	-DVPN_NAME_FILES_DIR=\""$(sysconfdir)/NetworkManager/VPN"\"	\
 	-DDBUS_API_SUBJECT_TO_CHANGE							\

Modified: trunk/src/vpn-password-dialog.c
==============================================================================
--- trunk/src/vpn-password-dialog.c	(original)
+++ trunk/src/vpn-password-dialog.c	Thu Jul  3 12:55:56 2008
@@ -141,6 +141,16 @@
 							  service);
 		gtk_window_present (GTK_WINDOW (dialog));
 		g_signal_connect_swapped (dialog, "response", G_CALLBACK (gtk_widget_destroy), dialog);
+	} else {
+		char *basename;
+
+		/* Remove any path component, then reconstruct path to the auth
+		 * dialog in LIBEXECDIR.
+		 */
+		basename = g_path_get_basename (prog);
+		g_free (prog);
+		prog = g_strdup_printf ("%s/%s", LIBEXECDIR, basename);
+		g_free (basename);
 	}
 
 	return prog;