[Gpredict-svn] SF.net SVN: gpredict: [7] trunk/src

[<cs...@us...>]

Revision: 7
          http://gpredict.svn.sourceforge.net/gpredict/?rev=7&view=rev
Author:   csete
Date:     2008-01-21 14:33:25 -0800 (Mon, 21 Jan 2008)

Log Message:
-----------
Removed manufacturer field. Will be part of the model.

Modified Paths:
--------------
    trunk/src/radio-conf.c
    trunk/src/radio-conf.h
    trunk/src/sat-pref-rig.c

Modified: trunk/src/radio-conf.c
===================================================================
--- trunk/src/radio-conf.c	2008-01-13 23:07:04 UTC (rev 6)
+++ trunk/src/radio-conf.c	2008-01-21 22:33:25 UTC (rev 7)
@@ -35,7 +35,6 @@
 #include "radio-conf.h"
 
 #define GROUP           "Radio"
-#define KEY_MFG         "Company"
 #define KEY_MODEL       "Model"
 #define KEY_ID          "ID"
 #define KEY_TYPE        "Type"
@@ -86,7 +85,6 @@
     g_free (fname);
     
     /* read parameters */
-    conf->company = g_key_file_get_string (cfg, GROUP, KEY_MFG, NULL);
     conf->model = g_key_file_get_string (cfg, GROUP, KEY_MODEL, NULL);
     conf->id = g_key_file_get_integer (cfg, GROUP, KEY_ID, NULL);
     conf->type = g_key_file_get_integer (cfg, GROUP, KEY_TYPE, NULL);
@@ -123,7 +121,6 @@
     /* create a config structure */
     cfg = g_key_file_new();
     
-    g_key_file_set_string (cfg, GROUP, KEY_MFG, conf->company);
     g_key_file_set_string (cfg, GROUP, KEY_MODEL, conf->model);
     g_key_file_set_integer (cfg, GROUP, KEY_ID, conf->id);
     g_key_file_set_integer (cfg, GROUP, KEY_TYPE, conf->type);

Modified: trunk/src/radio-conf.h
===================================================================
--- trunk/src/radio-conf.h	2008-01-13 23:07:04 UTC (rev 6)
+++ trunk/src/radio-conf.h	2008-01-21 22:33:25 UTC (rev 7)
@@ -55,8 +55,7 @@
 /** \brief Radio configuration. */
 typedef struct {
     gchar       *name;      /*!< Configuration file name. */
-    gchar       *company;   /*!< Manufacturer, e.g. ICOM. */
-    gchar       *model;     /*!< Radio model, e.g. IC-910H. */
+    gchar       *model;     /*!< Radio model, e.g. ICOM IC-910H. */
     guint        id;        /*!< Hamlib ID. */
     radio_type_t type;      /*!< Radio type. */
     gchar       *port;      /*!< Device name, e.g. /dev/ttyS0. */

Modified: trunk/src/sat-pref-rig.c
===================================================================
--- trunk/src/sat-pref-rig.c	2008-01-13 23:07:04 UTC (rev 6)
+++ trunk/src/sat-pref-rig.c	2008-01-21 22:33:25 UTC (rev 7)
@@ -129,13 +129,6 @@
                                              NULL);
     gtk_tree_view_insert_column (GTK_TREE_VIEW (riglist), column, -1);
 
-    /* Company */
-    renderer = gtk_cell_renderer_text_new ();
-    column = gtk_tree_view_column_new_with_attributes (_("Company"), renderer,
-                                                       "text", RIG_LIST_COL_COMP,
-                                                       NULL);
-    gtk_tree_view_insert_column (GTK_TREE_VIEW (riglist), column, -1);
-
     /* Model */
     renderer = gtk_cell_renderer_text_new ();
     column = gtk_tree_view_column_new_with_attributes (_("Model"), renderer,
@@ -220,7 +213,6 @@
     /* create a new list store */
     liststore = gtk_list_store_new (RIG_LIST_COL_NUM,
                                     G_TYPE_STRING,    // name
-                                    G_TYPE_STRING,    // company
                                     G_TYPE_STRING,    // model
                                     G_TYPE_INT,       // hamlib id
                                     G_TYPE_INT,       // radio type
@@ -250,7 +242,6 @@
                     gtk_list_store_append (liststore, &item);
                     gtk_list_store_set (liststore, &item,
                                         RIG_LIST_COL_NAME, conf.name,
-                                        RIG_LIST_COL_COMP, conf.company,
                                         RIG_LIST_COL_MODEL, conf.model,
                                         RIG_LIST_COL_ID, conf.id,
                                         RIG_LIST_COL_TYPE, conf.type,
@@ -268,9 +259,6 @@
                     if (conf.name)
                         g_free (conf.name);
                     
-                    if (conf.company)
-                        g_free (conf.company);
-                    
                     if (conf.model)
                         g_free (conf.model);
                     
@@ -376,8 +364,19 @@
  */
 static void add_cb    (GtkWidget *button, gpointer data)
 {
-    radio_conf_t conf;
+    radio_conf_t conf = {
+        .name  = NULL,
+        .model = NULL,
+        .id    = 0,
+        .type  = RADIO_TYPE_RX,
+        .port  = NULL,
+        .speed = 0,
+        .civ   = 0,
+        .dtr   = LINE_UNDEF,
+        .rts   = LINE_UNDEF,
+    };
     
+    
     sat_pref_rig_editor_run (&conf);
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.