Merge branch 'auto-connect'

diff --git a/configure.ac b/configure.ac
index 8bad2e2c6e0a0c8176cda0e8aaa4779b78620abb..90ffc94f5c8a5abdd4062302c2974bb1e6130d52 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -9,11 +9,11 @@ AC_COPYRIGHT([
 #   (Interfaces removed:    CURRENT++, AGE=0, REVISION=0)
 #   (Interfaces added:      CURRENT++, AGE++, REVISION=0)
 #   (No interfaces changed:                   REVISION++)
-LIBEMPATHY_CURRENT=29
+LIBEMPATHY_CURRENT=30
 LIBEMPATHY_AGE=0
 LIBEMPATHY_REVISION=0
 
-LIBEMPATHY_GTK_CURRENT=27
+LIBEMPATHY_GTK_CURRENT=28
 LIBEMPATHY_GTK_AGE=0
 LIBEMPATHY_GTK_REVISION=0
 

diff --git a/src/empathy.c b/src/empathy.c
index 09d90744d9440426f08a04d82f4a149583993c8e..8a2f107b7baddc6d763f380a6ae189db1a3eae63 100644 (file)
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -618,7 +618,7 @@ setup_dispatcher (void)
       g_ptr_array_add (filters, asv);
     }
 
-  empathy_dispatcher_add_handler (d, PACKAGE_NAME"MoreThenMeetsTheEye",
+  empathy_dispatcher_add_handler (d, PACKAGE_NAME"MoreThanMeetsTheEye",
     filters, capabilities);
 
   g_ptr_array_foreach (filters, (GFunc) g_hash_table_destroy, NULL);