* Added support for Google Video and Metacafe.

* Updated ChangeLog.

ChangeLog

@@ -1,6 +1,12 @@
 Pidgin Embedded Video:
 The easiest way to watch videos while chatting with your friends.
 
+version 1.1 (11/09/2009):
+	* Completely changed the structure of the plugin and the compilation
+	  process to generate a single file (embeddedvideo.so).
+	* Added support for CollegeHumor, Dailymotion, Google Video, Metacafe,
+	  MySpace Video, Trilulilu (audio, image and video) and Yahoo! Video.
+
 version 1.0 (09/12/2009):
 	* The plugin automatically inserts the video pointed to into the
 	  conversation when an appropriate link is sent or received.

src/embeddedvideo.c

@@ -198,8 +198,13 @@ static PurplePluginInfo info = {
     "Pidgin Embedded Video",
     "1.1",
     "Watch videos directly into the conversation.",
-    "This plugin provides you an easy way to watch videos from popular websites (Trilulilu, Vimeo, Youtube) directly into the conversation. Send and receive links and the plugin will insert the video.",
-    "Stefan Istrate <[email protected]>\nMarius Stroe <[email protected]>",
+    "This plugin provides you an easy way to watch videos from popular websites"
+        " (CollegeHumor, Dailymotion, Google Video, Metacafe, MySpace Video,"
+        " Trilulilu, Vimeo, Yahoo! Video and Youtube) directly into the"
+        " conversation. Send and receive links and the plugin will insert the"
+        " video.",
+    "Stefan Istrate <[email protected]>\n"
+        "Marius Stroe <[email protected]>",
     "http://code.google.com/p/pidgin-embeddedvideo/",
 
     plugin_load,

src/websites.c

@@ -13,6 +13,8 @@ websites_init()
     /* Extern declarations. */
     extern WebsiteInfo  collegehumor,
                         dailymotion,
+                        google_video,
+                        metacafe,
                         myspace_video,
                         trilulilu_audio,
                         trilulilu_image,
@@ -25,6 +27,8 @@ websites_init()
     list = NULL;
     list = g_list_append(list, &collegehumor);
     list = g_list_append(list, &dailymotion);
+    list = g_list_append(list, &google_video);
+    list = g_list_append(list, &metacafe);
     list = g_list_append(list, &myspace_video);
     list = g_list_append(list, &trilulilu_audio);
     list = g_list_append(list, &trilulilu_image);

src/websites/Makefile.am

@@ -2,6 +2,8 @@ PLUGIN_CFLAGS = @GLIB_CFLAGS@ @PIDGIN_CFLAGS@ @WEBKIT_CFLAGS@ @LIBCURL_CFLAGS@
 
 WEBSITES =  collegehumor.lo \
             dailymotion.lo \
+            google-video.lo \
+            metacafe.lo \
             myspace-video.lo \
             trilulilu-audio.lo \
             trilulilu-image.lo \

src/websites/Makefile.in

@@ -174,6 +174,8 @@ top_srcdir = @top_srcdir@
 PLUGIN_CFLAGS = @GLIB_CFLAGS@ @PIDGIN_CFLAGS@ @WEBKIT_CFLAGS@ @LIBCURL_CFLAGS@
 WEBSITES = collegehumor.lo \
             dailymotion.lo \
+            google-video.lo \
+            metacafe.lo \
             myspace-video.lo \
             trilulilu-audio.lo \
             trilulilu-image.lo \

src/websites/google-video.c

@@ -0,0 +1,8 @@
+#include <websites.h>
+
+WebsiteInfo google_video = {
+    "google-video",
+    "^(?i)(http://)?video\\.google\\.com/videoplay\\?docid=(?<video_id>-?\\d+)([&#].*)?$",
+    "<embed id=VideoPlayback src=http://video.google.com/googleplayer.swf?docid=%VIDEO_ID%&hl=en&fs=true style=width:400px;height:326px allowFullScreen=true allowScriptAccess=always type=application/x-shockwave-flash></embed>",
+    NULL
+};

src/websites/metacafe.c

@@ -0,0 +1,8 @@
+#include <websites.h>
+
+WebsiteInfo metacafe = {
+    "metacafe",
+    "^(?i)(?<http>http://)?(?(<http>)(www\\.)?|(www\\.))metacafe\\.com/watch/(?-i)(?<video_id>\\d+)/(?<misc1>[\\w\\d]+)([/\\?#].*)?$",
+    "<embed src=\"http://www.metacafe.com/fplayer/%VIDEO_ID%/%MISC1%.swf\" width=\"400\" height=\"345\" wmode=\"transparent\" pluginspage=\"http://www.macromedia.com/go/getflashplayer\" type=\"application/x-shockwave-flash\" allowFullScreen=\"true\" allowScriptAccess=\"always\" name=\"Metacafe_%VIDEO_ID%\"></embed>",
+    NULL
+};