[dia] Make old "Standard - Bus" an alias in sheet, rather than code



commit 303051e778362333fd02a5bd5241814656f4bd8b
Author: Hans Breuer <hans breuer org>
Date:   Sun Aug 24 17:20:35 2014 +0200

    Make old "Standard - Bus" an alias in sheet, rather than code

 objects/network/bus.c     |    8 --------
 objects/network/network.c |    2 --
 sheets/network.sheet.in   |    2 ++
 3 files changed, 2 insertions(+), 10 deletions(-)
---
diff --git a/objects/network/bus.c b/objects/network/bus.c
index 64c5b62..86d2a0c 100644
--- a/objects/network/bus.c
+++ b/objects/network/bus.c
@@ -113,14 +113,6 @@ DiaObjectType bus_type =
   &bus_type_ops       /* ops */
 };
 
-DiaObjectType bus_type_std = /* Old mistake, left for backwards compatibility */
-{
-  "Standard - Bus",   /* name */
-  0,                  /* version */
-  (const char **) bus_xpm,  /* pixmap */
-  &bus_type_ops       /* ops */
-};
-
 static ObjectOps bus_ops = {
   (DestroyFunc)         bus_destroy,
   (DrawFunc)            bus_draw,
diff --git a/objects/network/network.c b/objects/network/network.c
index 791d388..2829ada 100644
--- a/objects/network/network.c
+++ b/objects/network/network.c
@@ -28,7 +28,6 @@
 #include "plug-ins.h"
 
 extern DiaObjectType bus_type;
-extern DiaObjectType bus_type_std;
 extern DiaObjectType radiocell_type;
 extern DiaObjectType basestation_type;
 extern DiaObjectType wanlink_type;
@@ -42,7 +41,6 @@ dia_plugin_init(PluginInfo *info)
                            NULL, NULL))
     return DIA_PLUGIN_INIT_ERROR;
 
-  object_register_type(&bus_type_std);
   object_register_type(&bus_type);
   object_register_type(&radiocell_type);
   object_register_type(&basestation_type);
diff --git a/sheets/network.sheet.in b/sheets/network.sheet.in
index 951430b..7bafcc0 100644
--- a/sheets/network.sheet.in
+++ b/sheets/network.sheet.in
@@ -13,6 +13,8 @@
       <_description>Storage</_description>
     </object>
     <object name="Network - Bus">
+      <!-- very old name kept for compatibility -->
+      <alias name="Standard - Bus"/>
       <_description>Ethernet bus</_description>
     </object>
     <object name="Network - General Printer">


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]