Otro que me sube los .bak! :)

diff --git a/Constructor/constructor.glade.bak b/Constructor/constructor.glade.bak
deleted file mode 100644 (file)
index ba34417..0000000
--- a/Constructor/constructor.glade.bak
+++ /dev/null
@@ -1,294 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
-<glade-interface>
-
-<widget class="GtkWindow" id="window1">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">window1</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-
-  <child>
-    <widget class="GtkVBox" id="vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child>
-       <widget class="GtkAlignment" id="alignment1">
-         <property name="visible">True</property>
-         <property name="xalign">0.5</property>
-         <property name="yalign">0.5</property>
-         <property name="xscale">1</property>
-         <property name="yscale">1</property>
-
-         <child>
-           <widget class="GtkMenuBar" id="menubar1">
-             <property name="visible">True</property>
-
-             <child>
-               <widget class="GtkMenuItem" id="menuitem1">
-                 <property name="visible">True</property>
-                 <property name="label" translatable="yes">_File</property>
-                 <property name="use_underline">True</property>
-
-                 <child>
-                   <widget class="GtkMenu" id="menu1">
-
-                     <child>
-                       <widget class="GtkImageMenuItem" id="new1">
-                         <property name="visible">True</property>
-                         <property name="label">gtk-new</property>
-                         <property name="use_stock">True</property>
-                         <signal name="activate" handler="on_new1_activate" last_modification_time="Tue, 14 Oct 2003 11:17:30 GMT"/>
-                       </widget>
-                     </child>
-
-                     <child>
-                       <widget class="GtkImageMenuItem" id="open1">
-                         <property name="visible">True</property>
-                         <property name="label">gtk-open</property>
-                         <property name="use_stock">True</property>
-                         <signal name="activate" handler="on_open1_activate" last_modification_time="Tue, 14 Oct 2003 11:17:30 GMT"/>
-                       </widget>
-                     </child>
-
-                     <child>
-                       <widget class="GtkImageMenuItem" id="save1">
-                         <property name="visible">True</property>
-                         <property name="label">gtk-save</property>
-                         <property name="use_stock">True</property>
-                         <signal name="activate" handler="on_save1_activate" last_modification_time="Tue, 14 Oct 2003 11:17:30 GMT"/>
-                       </widget>
-                     </child>
-
-                     <child>
-                       <widget class="GtkImageMenuItem" id="save_as1">
-                         <property name="visible">True</property>
-                         <property name="label">gtk-save-as</property>
-                         <property name="use_stock">True</property>
-                         <signal name="activate" handler="on_save_as1_activate" last_modification_time="Tue, 14 Oct 2003 11:17:30 GMT"/>
-                       </widget>
-                     </child>
-
-                     <child>
-                       <widget class="GtkSeparatorMenuItem" id="separatormenuitem1">
-                         <property name="visible">True</property>
-                       </widget>
-                     </child>
-
-                     <child>
-                       <widget class="GtkImageMenuItem" id="quit1">
-                         <property name="visible">True</property>
-                         <property name="label">gtk-quit</property>
-                         <property name="use_stock">True</property>
-                         <signal name="activate" handler="on_quit1_activate" last_modification_time="Tue, 14 Oct 2003 11:17:30 GMT"/>
-                       </widget>
-                     </child>
-                   </widget>
-                 </child>
-               </widget>
-             </child>
-
-             <child>
-               <widget class="GtkMenuItem" id="menuitem2">
-                 <property name="visible">True</property>
-                 <property name="label" translatable="yes">_Edit</property>
-                 <property name="use_underline">True</property>
-
-                 <child>
-                   <widget class="GtkMenu" id="menu2">
-
-                     <child>
-                       <widget class="GtkImageMenuItem" id="copy1">
-                         <property name="visible">True</property>
-                         <property name="label">gtk-copy</property>
-                         <property name="use_stock">True</property>
-                         <signal name="activate" handler="on_copy1_activate" last_modification_time="Tue, 14 Oct 2003 11:17:30 GMT"/>
-                       </widget>
-                     </child>
-
-                     <child>
-                       <widget class="GtkImageMenuItem" id="paste1">
-                         <property name="visible">True</property>
-                         <property name="label">gtk-paste</property>
-                         <property name="use_stock">True</property>
-                         <signal name="activate" handler="on_paste1_activate" last_modification_time="Tue, 14 Oct 2003 11:17:30 GMT"/>
-                       </widget>
-                     </child>
-
-                     <child>
-                       <widget class="GtkImageMenuItem" id="delete1">
-                         <property name="visible">True</property>
-                         <property name="label">gtk-delete</property>
-                         <property name="use_stock">True</property>
-                         <signal name="activate" handler="on_delete1_activate" last_modification_time="Tue, 14 Oct 2003 11:17:30 GMT"/>
-                       </widget>
-                     </child>
-                   </widget>
-                 </child>
-               </widget>
-             </child>
-
-             <child>
-               <widget class="GtkMenuItem" id="menuitem3">
-                 <property name="visible">True</property>
-                 <property name="label" translatable="yes">_View</property>
-                 <property name="use_underline">True</property>
-
-                 <child>
-                   <widget class="GtkMenu" id="menu3">
-                   </widget>
-                 </child>
-               </widget>
-             </child>
-
-             <child>
-               <widget class="GtkMenuItem" id="menuitem4">
-                 <property name="visible">True</property>
-                 <property name="label" translatable="yes">_Help</property>
-                 <property name="use_underline">True</property>
-
-                 <child>
-                   <widget class="GtkMenu" id="menu4">
-
-                     <child>
-                       <widget class="GtkMenuItem" id="about1">
-                         <property name="visible">True</property>
-                         <property name="label" translatable="yes">_About</property>
-                         <property name="use_underline">True</property>
-                         <signal name="activate" handler="on_about1_activate" last_modification_time="Tue, 14 Oct 2003 11:17:30 GMT"/>
-                       </widget>
-                     </child>
-                   </widget>
-                 </child>
-               </widget>
-             </child>
-           </widget>
-         </child>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">False</property>
-         <property name="fill">False</property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkAlignment" id="alignment2">
-         <property name="visible">True</property>
-         <property name="xalign">0.5</property>
-         <property name="yalign">0.5</property>
-         <property name="xscale">1</property>
-         <property name="yscale">1</property>
-
-         <child>
-           <widget class="GtkHBox" id="hbox1">
-             <property name="visible">True</property>
-             <property name="homogeneous">False</property>
-             <property name="spacing">0</property>
-
-             <child>
-               <widget class="GtkVBox" id="vbox2">
-                 <property name="visible">True</property>
-                 <property name="homogeneous">False</property>
-                 <property name="spacing">0</property>
-
-                 <child>
-                   <widget class="GtkVButtonBox" id="vbuttonbox1">
-                     <property name="height_request">1</property>
-                     <property name="visible">True</property>
-                     <property name="layout_style">GTK_BUTTONBOX_SPREAD</property>
-                     <property name="spacing">0</property>
-
-                     <child>
-                       <widget class="GtkButton" id="button6">
-                         <property name="visible">True</property>
-                         <property name="can_default">True</property>
-                         <property name="can_focus">True</property>
-                         <property name="label" translatable="yes">button6</property>
-                         <property name="use_underline">True</property>
-                         <property name="relief">GTK_RELIEF_NORMAL</property>
-                       </widget>
-                     </child>
-
-                     <child>
-                       <widget class="GtkButton" id="button7">
-                         <property name="visible">True</property>
-                         <property name="can_default">True</property>
-                         <property name="can_focus">True</property>
-                         <property name="label" translatable="yes">button7</property>
-                         <property name="use_underline">True</property>
-                         <property name="relief">GTK_RELIEF_NORMAL</property>
-                       </widget>
-                     </child>
-
-                     <child>
-                       <widget class="GtkButton" id="button8">
-                         <property name="visible">True</property>
-                         <property name="can_default">True</property>
-                         <property name="can_focus">True</property>
-                         <property name="label" translatable="yes">button8</property>
-                         <property name="use_underline">True</property>
-                         <property name="relief">GTK_RELIEF_NORMAL</property>
-                       </widget>
-                     </child>
-                   </widget>
-                   <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">True</property>
-                     <property name="fill">True</property>
-                   </packing>
-                 </child>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">False</property>
-                 <property name="fill">False</property>
-               </packing>
-             </child>
-
-             <child>
-               <widget class="GtkScrolledWindow" id="scrolledwindow1">
-                 <property name="visible">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-                 <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-                 <property name="shadow_type">GTK_SHADOW_NONE</property>
-                 <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-                 <child>
-                   <widget class="GtkViewport" id="viewport1">
-                     <property name="visible">True</property>
-                     <property name="shadow_type">GTK_SHADOW_IN</property>
-
-                     <child>
-                       <placeholder/>
-                     </child>
-                   </widget>
-                 </child>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">True</property>
-                 <property name="fill">True</property>
-               </packing>
-             </child>
-           </widget>
-         </child>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">True</property>
-         <property name="fill">True</property>
-       </packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-</glade-interface>

diff --git a/Constructor/constructor.gladep.bak b/Constructor/constructor.gladep.bak
deleted file mode 100644 (file)
index 183077b..0000000
--- a/Constructor/constructor.gladep.bak
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-project SYSTEM "http://glade.gnome.org/glade-project-2.0.dtd">
-
-<glade-project>
-  <name></name>
-  <program_name></program_name>
-  <gnome_support>FALSE</gnome_support>
-</glade-project>

diff --git a/tests/skstream/Makefile b/tests/skstream/Makefile
index 385f735276e833c5d033b0dafdbd8945aff6c93e..983f331e960ae5c5fdd8ee05e9b348456e6dfa6d 100644 (file)
--- a/tests/skstream/Makefile
+++ b/tests/skstream/Makefile
@@ -7,5 +7,7 @@ CXXFLAGS=-ansi -pedantic -Wall -g3 `skstream-config --cflags`
 LDFLAGS=`skstream-config --libs`
 
 # Regla por defecto.
-cliente: cliente.cc
+all: cliente servidor
+cliente: cliente.cpp
+servidor: servidor.cpp
 

diff --git a/tests/skstream/cliente.cc b/tests/skstream/cliente.cpp
similarity index 100%
rename from tests/skstream/cliente.cc
rename to tests/skstream/cliente.cpp