[Amsn-commits] SF.net SVN: amsn:[12361] trunk/amsn

[<vi...@us...>]

Revision: 12361
          http://amsn.svn.sourceforge.net/amsn/?rev=12361&view=rev
Author:   vivia
Date:     2012-03-09 23:31:00 +0000 (Fri, 09 Mar 2012)
Log Message:
-----------
User@Hotmail.Com and us...@ho... are exactly the same address -> convert email to lowercase after user types it

Modified Paths:
--------------
    trunk/amsn/login_screen.tcl
    trunk/amsn/utils/linux/capture/libng/plugins/Rules.mk

Modified: trunk/amsn/login_screen.tcl
===================================================================
--- trunk/amsn/login_screen.tcl	2012-03-03 06:21:12 UTC (rev 12360)
+++ trunk/amsn/login_screen.tcl	2012-03-09 23:31:00 UTC (rev 12361)
@@ -655,6 +655,7 @@
 		# Don't let us use integers as username (see UsernameEdited)
 		if { [string is integer $user] } { set user "" }
 		# We have to check whether this profile exists because sometimes userSelected gets called when it shouldn't,
+                set user [string tolower $user]
 		# e.g when tab is pressed in the username combobox
 		if { [LoginList exists 0 $user] } {
 			# Select and disable 'remember me' checkbutton

Modified: trunk/amsn/utils/linux/capture/libng/plugins/Rules.mk
===================================================================
--- trunk/amsn/utils/linux/capture/libng/plugins/Rules.mk	2012-03-03 06:21:12 UTC (rev 12360)
+++ trunk/amsn/utils/linux/capture/libng/plugins/Rules.mk	2012-03-09 23:31:00 UTC (rev 12361)
@@ -17,6 +17,13 @@
 	$(capture_dir)/libng/plugins/drv0-v4l2.so
 endif
 
+plugin_link_so         = $(CC) $(LDFLAGS) $^ $(LDLIBS) $(capture_dir)/capture.so $(SHARED) -o $@
+ifeq ($(verbose),no)
+  echo_plugin_link_so          = echo "  LDP    " $@
+else
+  echo_plugin_link_so          = echo $(plugin_link_so)
+endif
+  
 # global targets
 all:: $(TARGETS-plugins)
 
@@ -25,21 +32,32 @@
 clean-plugins:
 	rm -f $(TARGETS-plugins) $(capture_dir)/libng/plugins/*.o
 
-$(capture_dir)/libng/plugins/sn9c10x.so: $(capture_dir)/libng/plugins/sn9c10x.o
+$(capture_dir)/libng/plugins/sn9c10x.so: $(capture_dir)/libng/plugins/sn9c10x.o 
+	@$(echo_plugin_link_so) 
+	@$(plugin_link_so)
 
-$(capture_dir)/libng/plugins/conv-mjpeg.so: $(capture_dir)/libng/plugins/conv-mjpeg.o
+$(capture_dir)/libng/plugins/conv-mjpeg.so: $(capture_dir)/libng/plugins/conv-mjpeg.o 
+	@$(echo_plugin_link_so) 
+	@$(plugin_link_so)
 
-$(capture_dir)/libng/plugins/drv0-bsd.so:   $(capture_dir)/libng/plugins/drv0-bsd.o
 
+$(capture_dir)/libng/plugins/drv0-bsd.so:   $(capture_dir)/libng/plugins/drv0-bsd.o 
+	@$(echo_plugin_link_so) 
+	@$(plugin_link_so)
+
 $(capture_dir)/libng/plugins/drv0-v4l2.so: \
 	$(capture_dir)/libng/plugins/drv0-v4l2.o \
 	$(capture_dir)/libng/plugins/struct-v4l2.o \
-	$(capture_dir)/libng/plugins/struct-dump.o
+	$(capture_dir)/libng/plugins/struct-dump.o 
+	@$(echo_plugin_link_so) 
+	@$(plugin_link_so)
 
 $(capture_dir)/libng/plugins/drv1-v4l.so: \
 	$(capture_dir)/libng/plugins/drv1-v4l.o \
 	$(capture_dir)/libng/plugins/struct-v4l.o \
-	$(capture_dir)/libng/plugins/struct-dump.o
+	$(capture_dir)/libng/plugins/struct-dump.o 
+	@$(echo_plugin_link_so) 
+	@$(plugin_link_so)
 
 $(capture_dir)/libng/plugins/struct-dump.o: $(capture_dir)/structs/struct-dump.c
 	@$(echo_compile_c)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.