another batch of connect->link fixes please let me know about issues and please refrain of making them yourself, so t...

Original commit message from CVS:
another batch of connect->link fixes
please let me know about issues
and please refrain of making them yourself, so that I don't spend double
the time resolving conflicts

23 files changed, 70 insertions, 70 deletions

diff --git a/gst/audiofx/audiowsincband.c b/gst/audiofx/audiowsincband.c
index 511d59e5..89c95f93 100644
--- a/gst/audiofx/audiowsincband.c
+++ b/gst/audiofx/audiowsincband.c
@@ -162,7 +162,7 @@ gst_bpwsinc_init (GstBPWSinc * filter)
 {
   filter->sinkpad = gst_pad_new_from_template (gst_filter_sink_factory (), "sink");
   gst_pad_set_chain_function (filter->sinkpad, gst_bpwsinc_chain);
-  gst_pad_set_connect_function (filter->sinkpad, gst_bpwsinc_sink_connect);
+  gst_pad_set_link_function (filter->sinkpad, gst_bpwsinc_sink_connect);
   gst_element_add_pad (GST_ELEMENT (filter), filter->sinkpad);
 
   filter->srcpad = gst_pad_new_from_template (gst_filter_src_factory (), "src");
@@ -189,7 +189,7 @@ gst_bpwsinc_sink_connect (GstPad * pad, GstCaps * caps)
   g_assert (caps != NULL);
 
   if (!GST_CAPS_IS_FIXED (caps))
-    return GST_PAD_CONNECT_DELAYED;
+    return GST_PAD_LINK_DELAYED;
  
   set_retval = gst_pad_try_set_caps (filter->srcpad, caps);
   
diff --git a/gst/audiofx/audiowsinclimit.c b/gst/audiofx/audiowsinclimit.c
index 1d5e6e3b..6be8e1ad 100644
--- a/gst/audiofx/audiowsinclimit.c
+++ b/gst/audiofx/audiowsinclimit.c
@@ -154,7 +154,7 @@ gst_lpwsinc_init (GstLPWSinc * filter)
 {
   filter->sinkpad = gst_pad_new_from_template (gst_filter_sink_factory (), "sink");
   gst_pad_set_chain_function (filter->sinkpad, gst_lpwsinc_chain);
-  gst_pad_set_connect_function (filter->sinkpad, gst_lpwsinc_sink_connect);
+  gst_pad_set_link_function (filter->sinkpad, gst_lpwsinc_sink_connect);
   gst_element_add_pad (GST_ELEMENT (filter), filter->sinkpad);
 
   filter->srcpad = gst_pad_new_from_template (gst_filter_src_factory (), "src");
@@ -178,7 +178,7 @@ gst_lpwsinc_sink_connect (GstPad * pad, GstCaps * caps)
   g_assert (caps != NULL);
 
   if (!GST_CAPS_IS_FIXED (caps))
-    return GST_PAD_CONNECT_DELAYED;
+    return GST_PAD_LINK_DELAYED;
 
   set_retval = gst_pad_try_set_caps(filter->srcpad, caps);
   
diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c
index 880e8a86..f66ea1d8 100644
--- a/gst/avi/gstavimux.c
+++ b/gst/avi/gstavimux.c
@@ -303,7 +303,7 @@ gst_avimux_sinkconnect (GstPad *pad, GstCaps *vscaps)
 
   /* we are not going to act on variable caps */
   if (!GST_CAPS_IS_FIXED (vscaps))
-    return GST_PAD_CONNECT_DELAYED;
+    return GST_PAD_LINK_DELAYED;
 
   GST_DEBUG (0, "avimux: sinkconnect triggered on %s", gst_pad_get_name (pad));
 
@@ -435,10 +435,10 @@ gst_avimux_sinkconnect (GstPad *pad, GstCaps *vscaps)
       goto done;
     }
   }
-  return GST_PAD_CONNECT_REFUSED;
+  return GST_PAD_LINK_REFUSED;
 
 done:
-  return GST_PAD_CONNECT_OK;
+  return GST_PAD_LINK_OK;
 }
 
 static void
@@ -467,7 +467,7 @@ gst_avimux_pad_connect (GstPad   *pad,
 }
 
 static void
-gst_avimux_pad_disconnect (GstPad   *pad,
+gst_avimux_pad_unlink (GstPad   *pad,
                            GstPad   *peer,
                            gpointer  data)
 {
@@ -490,7 +490,7 @@ gst_avimux_pad_disconnect (GstPad   *pad,
     return;
   }
 
-  GST_DEBUG(GST_CAT_PLUGIN_INFO, "pad '%s' disconnected", padname);
+  GST_DEBUG(GST_CAT_PLUGIN_INFO, "pad '%s' unlinked", padname);
 
   /* is this allowed? */
   gst_pad_destroy(pad);
@@ -532,9 +532,9 @@ gst_avimux_request_new_pad (GstElement     *element,
 
   g_signal_connect(newpad, "connected",
     G_CALLBACK(gst_avimux_pad_connect), (gpointer)avimux);
-  g_signal_connect(newpad, "disconnected",
-    G_CALLBACK(gst_avimux_pad_disconnect), (gpointer)avimux);
-  gst_pad_set_connect_function (newpad, gst_avimux_sinkconnect);
+  g_signal_connect(newpad, "unlinked",
+    G_CALLBACK(gst_avimux_pad_unlink), (gpointer)avimux);
+  gst_pad_set_link_function (newpad, gst_avimux_sinkconnect);
   gst_element_add_pad (element, newpad);
   gst_pad_set_event_function(newpad, gst_avimux_handle_event);
   gst_pad_set_event_mask_function(newpad, gst_avimux_get_event_masks);
diff --git a/gst/cutter/gstcutter.c b/gst/cutter/gstcutter.c
index b5618146..7627ff85 100644
--- a/gst/cutter/gstcutter.c
+++ b/gst/cutter/gstcutter.c
@@ -115,13 +115,13 @@ gst_cutter_connect (GstPad *pad, GstCaps *caps)
   GstPad *otherpad;
   
   filter = GST_CUTTER (gst_pad_get_parent (pad));
-  g_return_val_if_fail (filter != NULL, GST_PAD_CONNECT_REFUSED);
-  g_return_val_if_fail (GST_IS_CUTTER (filter), GST_PAD_CONNECT_REFUSED);
+  g_return_val_if_fail (filter != NULL, GST_PAD_LINK_REFUSED);
+  g_return_val_if_fail (GST_IS_CUTTER (filter), GST_PAD_LINK_REFUSED);
   otherpad = (pad == filter->srcpad ? filter->sinkpad : filter->srcpad);
 
   if (GST_CAPS_IS_FIXED (caps)) 
     return gst_pad_try_set_caps (otherpad, caps);
-  return GST_PAD_CONNECT_DELAYED;
+  return GST_PAD_LINK_DELAYED;
 }
 
 static void
@@ -179,10 +179,10 @@ gst_cutter_init (GstCutter *filter)
 
   gst_element_add_pad (GST_ELEMENT (filter), filter->sinkpad);
   gst_pad_set_chain_function (filter->sinkpad, gst_cutter_chain);
-  gst_pad_set_connect_function (filter->sinkpad, gst_cutter_connect);
+  gst_pad_set_link_function (filter->sinkpad, gst_cutter_connect);
   filter->srcpad = gst_pad_new ("src", GST_PAD_SRC);
   gst_element_add_pad (GST_ELEMENT (filter), filter->srcpad);
-  gst_pad_set_connect_function (filter->srcpad, gst_cutter_connect);
+  gst_pad_set_link_function (filter->srcpad, gst_cutter_connect);
 }
 
 static void
diff --git a/gst/effectv/gstaging.c b/gst/effectv/gstaging.c
index b24456d9..070c5f19 100644
--- a/gst/effectv/gstaging.c
+++ b/gst/effectv/gstaging.c
@@ -157,7 +157,7 @@ gst_agingtv_sinkconnect (GstPad * pad, GstCaps * caps)
   filter = GST_AGINGTV (gst_pad_get_parent (pad));
 
   if (!GST_CAPS_IS_FIXED (caps))
-    return GST_PAD_CONNECT_DELAYED;
+    return GST_PAD_LINK_DELAYED;
 
   gst_caps_get_int (caps, "width", &filter->width);
   gst_caps_get_int (caps, "height", &filter->height);
@@ -174,7 +174,7 @@ gst_agingtv_init (GstAgingTV * filter)
 {
   filter->sinkpad = gst_pad_new_from_template (gst_effectv_sink_factory (), "sink");
   gst_pad_set_chain_function (filter->sinkpad, gst_agingtv_chain);
-  gst_pad_set_connect_function (filter->sinkpad, gst_agingtv_sinkconnect);
+  gst_pad_set_link_function (filter->sinkpad, gst_agingtv_sinkconnect);
   gst_element_add_pad (GST_ELEMENT (filter), filter->sinkpad);
 
   filter->srcpad = gst_pad_new_from_template (gst_effectv_src_factory (), "src");
diff --git a/gst/effectv/gstdice.c b/gst/effectv/gstdice.c
index 93f2878b..6f1e9f20 100644
--- a/gst/effectv/gstdice.c
+++ b/gst/effectv/gstdice.c
@@ -163,7 +163,7 @@ gst_dicetv_sinkconnect (GstPad * pad, GstCaps * caps)
   filter = GST_DICETV (gst_pad_get_parent (pad));
 
   if (!GST_CAPS_IS_FIXED (caps))
-    return GST_PAD_CONNECT_DELAYED;
+    return GST_PAD_LINK_DELAYED;
 
   gst_caps_get_int (caps, "width", &filter->width);
   gst_caps_get_int (caps, "height", &filter->height);
@@ -180,7 +180,7 @@ gst_dicetv_init (GstDiceTV * filter)
 {
   filter->sinkpad = gst_pad_new_from_template (gst_effectv_sink_factory (), "sink");
   gst_pad_set_chain_function (filter->sinkpad, gst_dicetv_chain);
-  gst_pad_set_connect_function (filter->sinkpad, gst_dicetv_sinkconnect);
+  gst_pad_set_link_function (filter->sinkpad, gst_dicetv_sinkconnect);
   gst_element_add_pad (GST_ELEMENT (filter), filter->sinkpad);
 
   filter->srcpad = gst_pad_new_from_template (gst_effectv_src_factory (), "src");
diff --git a/gst/effectv/gstedge.c b/gst/effectv/gstedge.c
index d03017f3..cc18aa20 100644
--- a/gst/effectv/gstedge.c
+++ b/gst/effectv/gstedge.c
@@ -137,7 +137,7 @@ gst_edgetv_sinkconnect (GstPad * pad, GstCaps * caps)
   filter = GST_EDGETV (gst_pad_get_parent (pad));
 
   if (!GST_CAPS_IS_FIXED (caps))
-    return GST_PAD_CONNECT_DELAYED;
+    return GST_PAD_LINK_DELAYED;
 
   gst_caps_get_int (caps, "width", &filter->width);
   gst_caps_get_int (caps, "height", &filter->height);
@@ -158,7 +158,7 @@ gst_edgetv_init (GstEdgeTV * filter)
 {
   filter->sinkpad = gst_pad_new_from_template (gst_effectv_sink_factory (), "sink");
   gst_pad_set_chain_function (filter->sinkpad, gst_edgetv_chain);
-  gst_pad_set_connect_function (filter->sinkpad, gst_edgetv_sinkconnect);
+  gst_pad_set_link_function (filter->sinkpad, gst_edgetv_sinkconnect);
   gst_element_add_pad (GST_ELEMENT (filter), filter->sinkpad);
 
   filter->srcpad = gst_pad_new_from_template (gst_effectv_src_factory (), "src");
diff --git a/gst/effectv/gstquark.c b/gst/effectv/gstquark.c
index c7e793ec..ac6ae719 100644
--- a/gst/effectv/gstquark.c
+++ b/gst/effectv/gstquark.c
@@ -163,7 +163,7 @@ gst_quarktv_sinkconnect (GstPad * pad, GstCaps * caps)
   filter = GST_QUARKTV (gst_pad_get_parent (pad));
 
   if (!GST_CAPS_IS_FIXED (caps))
-    return GST_PAD_CONNECT_DELAYED;
+    return GST_PAD_LINK_DELAYED;
 
   gst_caps_get_int (caps, "width", &filter->width);
   gst_caps_get_int (caps, "height", &filter->height);
@@ -185,7 +185,7 @@ gst_quarktv_init (GstQuarkTV * filter)
 {
   filter->sinkpad = gst_pad_new_from_template (gst_effectv_sink_factory (), "sink");
   gst_pad_set_chain_function (filter->sinkpad, gst_quarktv_chain);
-  gst_pad_set_connect_function (filter->sinkpad, gst_quarktv_sinkconnect);
+  gst_pad_set_link_function (filter->sinkpad, gst_quarktv_sinkconnect);
   gst_element_add_pad (GST_ELEMENT (filter), filter->sinkpad);
 
   filter->srcpad = gst_pad_new_from_template (gst_effectv_src_factory (), "src");
diff --git a/gst/effectv/gstrev.c b/gst/effectv/gstrev.c
index 1849c3bc..49cbfb23 100644
--- a/gst/effectv/gstrev.c
+++ b/gst/effectv/gstrev.c
@@ -176,7 +176,7 @@ gst_revtv_sinkconnect (GstPad * pad, GstCaps * caps)
   filter = GST_REVTV (gst_pad_get_parent (pad));
 
   if (!GST_CAPS_IS_FIXED (caps))
-    return GST_PAD_CONNECT_DELAYED;
+    return GST_PAD_LINK_DELAYED;
 
   gst_caps_get_int (caps, "width", &filter->width);
   gst_caps_get_int (caps, "height", &filter->height);
@@ -189,7 +189,7 @@ gst_revtv_init (GstRevTV * filter)
 {
   filter->sinkpad = gst_pad_new_from_template (gst_effectv_sink_factory (), "sink");
   gst_pad_set_chain_function (filter->sinkpad, gst_revtv_chain);
-  gst_pad_set_connect_function (filter->sinkpad, gst_revtv_sinkconnect);
+  gst_pad_set_link_function (filter->sinkpad, gst_revtv_sinkconnect);
   gst_element_add_pad (GST_ELEMENT (filter), filter->sinkpad);
 
   filter->srcpad = gst_pad_new_from_template (gst_effectv_src_factory (), "src");
diff --git a/gst/effectv/gstshagadelic.c b/gst/effectv/gstshagadelic.c
index f401ac6d..63cc0a03 100644
--- a/gst/effectv/gstshagadelic.c
+++ b/gst/effectv/gstshagadelic.c
@@ -147,7 +147,7 @@ gst_shagadelictv_sinkconnect (GstPad * pad, GstCaps * caps)
   filter = GST_SHAGADELICTV (gst_pad_get_parent (pad));
 
   if (!GST_CAPS_IS_FIXED (caps))
-    return GST_PAD_CONNECT_DELAYED;
+    return GST_PAD_LINK_DELAYED;
 
   gst_caps_get_int (caps, "width", &filter->width);
   gst_caps_get_int (caps, "height", &filter->height);
@@ -170,7 +170,7 @@ gst_shagadelictv_init (GstShagadelicTV * filter)
 {
   filter->sinkpad = gst_pad_new_from_template (gst_effectv_sink_factory (), "sink");
   gst_pad_set_chain_function (filter->sinkpad, gst_shagadelictv_chain);
-  gst_pad_set_connect_function (filter->sinkpad, gst_shagadelictv_sinkconnect);
+  gst_pad_set_link_function (filter->sinkpad, gst_shagadelictv_sinkconnect);
   gst_element_add_pad (GST_ELEMENT (filter), filter->sinkpad);
 
   filter->srcpad = gst_pad_new_from_template (gst_effectv_src_factory (), "src");
diff --git a/gst/effectv/gstvertigo.c b/gst/effectv/gstvertigo.c
index 1233f953..d40c89b9 100644
--- a/gst/effectv/gstvertigo.c
+++ b/gst/effectv/gstvertigo.c
@@ -181,7 +181,7 @@ gst_vertigotv_sinkconnect (GstPad * pad, GstCaps * caps)
   filter = GST_VERTIGOTV (gst_pad_get_parent (pad));
 
   if (!GST_CAPS_IS_FIXED (caps))
-    return GST_PAD_CONNECT_DELAYED;
+    return GST_PAD_LINK_DELAYED;
 
   gst_caps_get_int (caps, "width", &filter->width);
   gst_caps_get_int (caps, "height", &filter->height);
@@ -204,7 +204,7 @@ gst_vertigotv_init (GstVertigoTV * filter)
 {
   filter->sinkpad = gst_pad_new_from_template (gst_effectv_sink_factory (), "sink");
   gst_pad_set_chain_function (filter->sinkpad, gst_vertigotv_chain);
-  gst_pad_set_connect_function (filter->sinkpad, gst_vertigotv_sinkconnect);
+  gst_pad_set_link_function (filter->sinkpad, gst_vertigotv_sinkconnect);
   gst_element_add_pad (GST_ELEMENT (filter), filter->sinkpad);
 
   filter->srcpad = gst_pad_new_from_template (gst_effectv_src_factory (), "src");
diff --git a/gst/effectv/gstwarp.c b/gst/effectv/gstwarp.c
index 0cebf889..939ca150 100644
--- a/gst/effectv/gstwarp.c
+++ b/gst/effectv/gstwarp.c
@@ -153,7 +153,7 @@ gst_warptv_sinkconnect (GstPad * pad, GstCaps * caps)
   filter = GST_WARPTV (gst_pad_get_parent (pad));
 
   if (!GST_CAPS_IS_FIXED (caps))
-    return GST_PAD_CONNECT_DELAYED;
+    return GST_PAD_LINK_DELAYED;
 
   gst_caps_get_int (caps, "width", &filter->width);
   gst_caps_get_int (caps, "height", &filter->height);
@@ -168,7 +168,7 @@ gst_warptv_init (GstWarpTV * filter)
 {
   filter->sinkpad = gst_pad_new_from_template (gst_effectv_sink_factory (), "sink");
   gst_pad_set_chain_function (filter->sinkpad, gst_warptv_chain);
-  gst_pad_set_connect_function (filter->sinkpad, gst_warptv_sinkconnect);
+  gst_pad_set_link_function (filter->sinkpad, gst_warptv_sinkconnect);
   gst_element_add_pad (GST_ELEMENT (filter), filter->sinkpad);
 
   filter->srcpad = gst_pad_new_from_template (gst_effectv_src_factory (), "src");
diff --git a/gst/goom/gstgoom.c b/gst/goom/gstgoom.c
index c5733960..0e7f3bb5 100644
--- a/gst/goom/gstgoom.c
+++ b/gst/goom/gstgoom.c
@@ -194,7 +194,7 @@ gst_goom_init (GstGOOM *goom)
   gst_element_add_pad (GST_ELEMENT (goom), goom->srcpad);
 
   gst_pad_set_chain_function (goom->sinkpad, gst_goom_chain);
-  gst_pad_set_connect_function (goom->sinkpad, gst_goom_sinkconnect);
+  gst_pad_set_link_function (goom->sinkpad, gst_goom_sinkconnect);
 
   goom->next_time = 0;
   goom->peerpool = NULL;
@@ -214,10 +214,10 @@ gst_goom_sinkconnect (GstPad *pad, GstCaps *caps)
   goom = GST_GOOM (gst_pad_get_parent (pad));
 
   if (!GST_CAPS_IS_FIXED (caps)) {
-    return GST_PAD_CONNECT_DELAYED;
+    return GST_PAD_LINK_DELAYED;
   }
 
-  return GST_PAD_CONNECT_OK;
+  return GST_PAD_LINK_OK;
 }
 
 static void
diff --git a/gst/law/mulaw-decode.c b/gst/law/mulaw-decode.c
index 3585a9cb..b36325f0 100644
--- a/gst/law/mulaw-decode.c
+++ b/gst/law/mulaw-decode.c
@@ -54,7 +54,7 @@ mulawdec_connect_sink (GstPad *pad, GstCaps *caps)
   GstMuLawDec* mulawdec=GST_MULAWDEC (GST_OBJECT_PARENT (pad));
   
   if (caps==NULL) 
-    return GST_PAD_CONNECT_REFUSED;
+    return GST_PAD_LINK_REFUSED;
 
   newcaps = gst_caps_copy(caps);
 
@@ -66,7 +66,7 @@ mulawdec_connect_sink (GstPad *pad, GstCaps *caps)
 
   if (GST_CAPS_IS_FIXED (newcaps))
     return gst_pad_try_set_caps (mulawdec->srcpad, newcaps);
-  return GST_PAD_CONNECT_DELAYED;
+  return GST_PAD_LINK_DELAYED;
 }		
 
 GType
@@ -109,7 +109,7 @@ gst_mulawdec_init (GstMuLawDec *mulawdec)
 {
   mulawdec->sinkpad = gst_pad_new_from_template(mulawdec_sink_template,"sink");
   mulawdec->srcpad = gst_pad_new_from_template(mulawdec_src_template,"src");
-  gst_pad_set_connect_function(mulawdec->sinkpad, mulawdec_connect_sink);
+  gst_pad_set_link_function(mulawdec->sinkpad, mulawdec_connect_sink);
 
   gst_element_add_pad(GST_ELEMENT(mulawdec),mulawdec->sinkpad);
   gst_pad_set_chain_function(mulawdec->sinkpad,gst_mulawdec_chain);
diff --git a/gst/level/gstlevel.c b/gst/level/gstlevel.c
index 62b2719c..55e9ff5b 100644
--- a/gst/level/gstlevel.c
+++ b/gst/level/gstlevel.c
@@ -127,8 +127,8 @@ gst_level_connect (GstPad *pad, GstCaps *caps)
   GstPad *otherpad;
 
   filter = GST_LEVEL (gst_pad_get_parent (pad));
-  g_return_val_if_fail (filter != NULL, GST_PAD_CONNECT_REFUSED);
-  g_return_val_if_fail (GST_IS_LEVEL (filter), GST_PAD_CONNECT_REFUSED);
+  g_return_val_if_fail (filter != NULL, GST_PAD_LINK_REFUSED);
+  g_return_val_if_fail (GST_IS_LEVEL (filter), GST_PAD_LINK_REFUSED);
   otherpad = (pad == filter->srcpad ? filter->sinkpad : filter->srcpad);
 	  
   if (GST_CAPS_IS_FIXED (caps)) 
@@ -136,7 +136,7 @@ gst_level_connect (GstPad *pad, GstCaps *caps)
     /*if ( !volume_parse_caps (filter, caps) || */
     return gst_pad_try_set_caps (otherpad, caps);
   }
-  return GST_PAD_CONNECT_DELAYED;
+  return GST_PAD_LINK_DELAYED;
 }
 
 static void
@@ -253,9 +253,9 @@ static void
 gst_level_init (GstLevel *filter)
 {
   filter->sinkpad = gst_pad_new_from_template (level_sink_factory (), "sink");
-  gst_pad_set_connect_function (filter->sinkpad, gst_level_connect);
+  gst_pad_set_link_function (filter->sinkpad, gst_level_connect);
   filter->srcpad = gst_pad_new_from_template (level_src_factory (), "src");
-  gst_pad_set_connect_function (filter->srcpad, gst_level_connect);
+  gst_pad_set_link_function (filter->srcpad, gst_level_connect);
 
   gst_element_add_pad (GST_ELEMENT (filter), filter->sinkpad);
   gst_pad_set_chain_function (filter->sinkpad, gst_level_chain);
diff --git a/gst/median/gstmedian.c b/gst/median/gstmedian.c
index 6a20404a..4260b72b 100644
--- a/gst/median/gstmedian.c
+++ b/gst/median/gstmedian.c
@@ -133,7 +133,7 @@ gst_median_sinkconnect (GstPad *pad, GstCaps *caps)
   filter = GST_MEDIAN (gst_pad_get_parent (pad));
 
   if (!GST_CAPS_IS_FIXED (caps))
-    return GST_PAD_CONNECT_DELAYED;
+    return GST_PAD_LINK_DELAYED;
 
   gst_caps_get_int (caps, "width", &filter->width);
   gst_caps_get_int (caps, "height", &filter->height);
@@ -146,7 +146,7 @@ void gst_median_init (GstMedian *median)
 {
   median->sinkpad = gst_pad_new_from_template (
 		  GST_PAD_TEMPLATE_GET (median_sink_factory), "sink");
-  gst_pad_set_connect_function (median->sinkpad, gst_median_sinkconnect);
+  gst_pad_set_link_function (median->sinkpad, gst_median_sinkconnect);
   gst_pad_set_chain_function (median->sinkpad, gst_median_chain);
   gst_element_add_pad (GST_ELEMENT (median), median->sinkpad);
 
diff --git a/gst/monoscope/gstmonoscope.c b/gst/monoscope/gstmonoscope.c
index 0519e092..d10ece2f 100644
--- a/gst/monoscope/gstmonoscope.c
+++ b/gst/monoscope/gstmonoscope.c
@@ -197,7 +197,7 @@ gst_monoscope_init (GstMonoscope *monoscope)
   gst_element_add_pad (GST_ELEMENT (monoscope), monoscope->srcpad);
 
   gst_pad_set_chain_function (monoscope->sinkpad, gst_monoscope_chain);
-  gst_pad_set_connect_function (monoscope->sinkpad, gst_monoscope_sinkconnect);
+  gst_pad_set_link_function (monoscope->sinkpad, gst_monoscope_sinkconnect);
 
   monoscope->next_time = 0;
   monoscope->peerpool = NULL;
@@ -217,10 +217,10 @@ gst_monoscope_sinkconnect (GstPad *pad, GstCaps *caps)
   monoscope = GST_MONOSCOPE (gst_pad_get_parent (pad));
 
   if (!GST_CAPS_IS_FIXED (caps)) {
-    return GST_PAD_CONNECT_DELAYED;
+    return GST_PAD_LINK_DELAYED;
   }
 
-  return GST_PAD_CONNECT_OK;
+  return GST_PAD_LINK_OK;
 }
 
 static void
diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c
index 4d6e155c..f6769893 100644
--- a/gst/qtdemux/qtdemux.c
+++ b/gst/qtdemux/qtdemux.c
@@ -687,7 +687,7 @@ gst_qtp_traverse(gpointer poffs,gpointer value,gpointer data)
 
   if (qtdemux->bs_pos < sample->offset) {
     gst_qtp_skip(qtdemux,sample->offset - qtdemux->bs_pos);
-    if (sample->track->pad && GST_PAD_IS_CONNECTED(sample->track->pad)) {
+    if (sample->track->pad && GST_PAD_IS_LINKED(sample->track->pad)) {
       GstBuffer * buf;
       buf = gst_qtp_read(qtdemux,sample->size);
       GST_BUFFER_TIMESTAMP(buf) = sample->timestamp;
diff --git a/gst/smpte/gstsmpte.c b/gst/smpte/gstsmpte.c
index a123010f..c28f16a6 100644
--- a/gst/smpte/gstsmpte.c
+++ b/gst/smpte/gstsmpte.c
@@ -228,7 +228,7 @@ gst_smpte_sinkconnect (GstPad *pad, GstCaps *caps)
   smpte = GST_SMPTE (gst_pad_get_parent (pad));
 
   if (!GST_CAPS_IS_FIXED (caps))
-    return GST_PAD_CONNECT_DELAYED;
+    return GST_PAD_LINK_DELAYED;
 
   gst_caps_get_int (caps, "width", &smpte->width);
   gst_caps_get_int (caps, "height", &smpte->height);
@@ -244,12 +244,12 @@ gst_smpte_init (GstSMPTE *smpte)
 {
   smpte->sinkpad1 = gst_pad_new_from_template (
 		  GST_PAD_TEMPLATE_GET (smpte_sink1_factory), "sink1");
-  gst_pad_set_connect_function (smpte->sinkpad1, gst_smpte_sinkconnect);
+  gst_pad_set_link_function (smpte->sinkpad1, gst_smpte_sinkconnect);
   gst_element_add_pad (GST_ELEMENT (smpte), smpte->sinkpad1);
 
   smpte->sinkpad2 = gst_pad_new_from_template (
 		  GST_PAD_TEMPLATE_GET (smpte_sink2_factory), "sink2");
-  gst_pad_set_connect_function (smpte->sinkpad2, gst_smpte_sinkconnect);
+  gst_pad_set_link_function (smpte->sinkpad2, gst_smpte_sinkconnect);
   gst_element_add_pad (GST_ELEMENT (smpte), smpte->sinkpad2);
 
   smpte->srcpad = gst_pad_new_from_template (
diff --git a/gst/udp/gstudpsink.c b/gst/udp/gstudpsink.c
index fc924840..b1071034 100644
--- a/gst/udp/gstudpsink.c
+++ b/gst/udp/gstudpsink.c
@@ -162,7 +162,7 @@ gst_udpsink_sinkconnect (GstPad *pad, GstCaps *caps)
   serverhost = gethostbyname(udpsink->host);
   if (serverhost == (struct hostent *)0) {
 	perror("gethostbyname");
-    	return GST_PAD_CONNECT_REFUSED;
+    	return GST_PAD_LINK_REFUSED;
   }
   
   memmove(&serv_addr.sin_addr,serverhost->h_addr, serverhost->h_length);
@@ -179,7 +179,7 @@ gst_udpsink_sinkconnect (GstPad *pad, GstCaps *caps)
     case CONTROL_UDP:
   	    if ((fd = socket (AF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1) {
     		perror("socket");
-    	    	return GST_PAD_CONNECT_REFUSED;
+    	    	return GST_PAD_LINK_REFUSED;
   	    }
 
 	    /* We can only do broadcast in udp */
@@ -191,7 +191,7 @@ gst_udpsink_sinkconnect (GstPad *pad, GstCaps *caps)
 	    if (sendto (fd, buf, buf_size, 0, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) == -1)
   	    {
 		perror("sending");
-    	    	return GST_PAD_CONNECT_REFUSED;
+    	    	return GST_PAD_LINK_REFUSED;
   	    } 
 
 	    close (fd);
@@ -199,13 +199,13 @@ gst_udpsink_sinkconnect (GstPad *pad, GstCaps *caps)
     case CONTROL_TCP:
   	    if ((fd = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP)) == -1) {
     		perror("socket");
-    	    	return GST_PAD_CONNECT_REFUSED;
+    	    	return GST_PAD_LINK_REFUSED;
   	    }
   
   	    if (connect(fd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) != 0) {
     		g_printerr ("udpsink: connect to %s port %d failed: %s\n",
 			     udpsink->host, udpsink->port, g_strerror(errno));
-    		return GST_PAD_CONNECT_REFUSED;
+    		return GST_PAD_LINK_REFUSED;
   	    }
   
 	    f = fdopen (dup (fd), "wb");
@@ -216,15 +216,15 @@ gst_udpsink_sinkconnect (GstPad *pad, GstCaps *caps)
   	    
 	    break;
     case CONTROL_NONE:
-    	    return GST_PAD_CONNECT_OK;
+    	    return GST_PAD_LINK_OK;
 	    break;
     default:
-    	    return GST_PAD_CONNECT_REFUSED;
+    	    return GST_PAD_LINK_REFUSED;
 	    break;
   }
 #endif
   
-  return GST_PAD_CONNECT_OK;
+  return GST_PAD_LINK_OK;
 }
 
 static void
@@ -244,7 +244,7 @@ gst_udpsink_init (GstUDPSink *udpsink)
   udpsink->sinkpad = gst_pad_new ("sink", GST_PAD_SINK);
   gst_element_add_pad (GST_ELEMENT (udpsink), udpsink->sinkpad);
   gst_pad_set_chain_function (udpsink->sinkpad, gst_udpsink_chain);
-  gst_pad_set_connect_function (udpsink->sinkpad, gst_udpsink_sinkconnect);
+  gst_pad_set_link_function (udpsink->sinkpad, gst_udpsink_sinkconnect);
 
   udpsink->host = g_strdup (UDP_DEFAULT_HOST);
   udpsink->port = UDP_DEFAULT_PORT;
diff --git a/gst/udp/gstudpsrc.c b/gst/udp/gstudpsrc.c
index 02da0a58..5ba2c74e 100644
--- a/gst/udp/gstudpsrc.c
+++ b/gst/udp/gstudpsrc.c
@@ -220,7 +220,7 @@ gst_udpsrc_get (GstPad *pad)
       caps = gst_caps_load_thyself(doc->xmlRootNode);
       
       /* foward the connect, we don't signal back the result here... */
-      gst_pad_proxy_connect (udpsrc->srcpad, caps);
+      gst_pad_proxy_link (udpsrc->srcpad, caps);
 
 #endif
       g_free (buf);
diff --git a/gst/videocrop/gstvideocrop.c b/gst/videocrop/gstvideocrop.c
index 0f051795..2ee1fce9 100644
--- a/gst/videocrop/gstvideocrop.c
+++ b/gst/videocrop/gstvideocrop.c
@@ -181,7 +181,7 @@ gst_video_crop_init (GstVideoCrop *video_crop)
 		  GST_PAD_TEMPLATE_GET (video_crop_sink_template_factory), "sink");
   gst_element_add_pad (GST_ELEMENT (video_crop), video_crop->sinkpad);
   gst_pad_set_chain_function (video_crop->sinkpad, GST_DEBUG_FUNCPTR (gst_video_crop_chain));
-  gst_pad_set_connect_function (video_crop->sinkpad, GST_DEBUG_FUNCPTR (gst_video_crop_sink_connect));
+  gst_pad_set_link_function (video_crop->sinkpad, GST_DEBUG_FUNCPTR (gst_video_crop_sink_connect));
 
   video_crop->srcpad = gst_pad_new_from_template(
 		  GST_PAD_TEMPLATE_GET (video_crop_src_template_factory), "src");
@@ -260,7 +260,7 @@ gst_video_crop_sink_connect (GstPad *pad, GstCaps *caps)
 
   /* we are not going to act on variable caps */
   if (!GST_CAPS_IS_FIXED (caps))
-    return GST_PAD_CONNECT_DELAYED;
+    return GST_PAD_LINK_DELAYED;
 
   video_crop = GST_VIDEO_CROP (gst_pad_get_parent (pad));
 
@@ -272,7 +272,7 @@ gst_video_crop_sink_connect (GstPad *pad, GstCaps *caps)
   if (video_crop->crop_height + video_crop->crop_y > video_crop->height)
     video_crop->crop_height = video_crop->height - video_crop->crop_y;
 
-  return GST_PAD_CONNECT_OK;
+  return GST_PAD_LINK_OK;
 }
 
 static void
diff --git a/gst/wavenc/gstwavenc.c b/gst/wavenc/gstwavenc.c
index 92268b1f..336811fc 100644
--- a/gst/wavenc/gstwavenc.c
+++ b/gst/wavenc/gstwavenc.c
@@ -216,7 +216,7 @@ gst_wavenc_sinkconnect (GstPad *pad,
   wavenc = GST_WAVENC (gst_pad_get_parent (pad));
 
   if (!GST_CAPS_IS_FIXED (caps)) {
-    return GST_PAD_CONNECT_DELAYED;
+    return GST_PAD_LINK_DELAYED;
   }
 
   gst_caps_get_int (caps, "channels", &wavenc->channels);
@@ -226,10 +226,10 @@ gst_wavenc_sinkconnect (GstPad *pad,
   gst_wavenc_setup (wavenc);
 
   if (wavenc->setup) {
-    return GST_PAD_CONNECT_OK;
+    return GST_PAD_LINK_OK;
   }
 
-  return GST_PAD_CONNECT_REFUSED;
+  return GST_PAD_LINK_REFUSED;
 }
 
 static void
@@ -238,7 +238,7 @@ gst_wavenc_init (GstWavEnc *wavenc)
   wavenc->sinkpad = gst_pad_new_from_template (sinktemplate, "sink");
   gst_element_add_pad (GST_ELEMENT (wavenc), wavenc->sinkpad);
   gst_pad_set_chain_function (wavenc->sinkpad, gst_wavenc_chain);
-  gst_pad_set_connect_function (wavenc->sinkpad, gst_wavenc_sinkconnect);
+  gst_pad_set_link_function (wavenc->sinkpad, gst_wavenc_sinkconnect);
 
   wavenc->srcpad = gst_pad_new_from_template (srctemplate, "src");
   gst_element_add_pad (GST_ELEMENT (wavenc), wavenc->srcpad);