/[xlog]/xlog/src/callbacks_preferencesdialog.c
ViewVC logotype

Diff of /xlog/src/callbacks_preferencesdialog.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.20 by pa4tu, Tue Aug 19 18:40:43 2003 UTC revision 1.21 by pa4tu, Fri Aug 22 17:24:22 2003 UTC
# Line 249  set_clock (gboolean on) Line 249  set_clock (gboolean on)
249  #if WANT_HAMLIB  #if WANT_HAMLIB
250  /* check if hamlib has changed */  /* check if hamlib has changed */
251  static gboolean hamlib_changed ( gint hamlibwidgets, gchar *radio, gchar *device,  static gboolean hamlib_changed ( gint hamlibwidgets, gchar *radio, gchar *device,
252    gint polltime, gchar *rigconf, gint round)    gint polltime, gchar *rigconf)
253  {  {
254    
255    if ((preferences.hamlib == 0) && (hamlibwidgets > 0))    if ((preferences.hamlib == 0) && (hamlibwidgets > 0))
# Line 262  static gboolean hamlib_changed ( gint ha Line 262  static gboolean hamlib_changed ( gint ha
262      return TRUE;      return TRUE;
263    else if (preferences.polltime != polltime)    else if (preferences.polltime != polltime)
264      return TRUE;      return TRUE;
   else if (preferences.round != round)  
     return TRUE;  
265    else    else
266    /* FALSE is returned when nothing is   *    /* FALSE is returned when nothing is   *
267     * changed or hamlib should be stopped */     * changed or hamlib should be stopped */
# Line 514  on_preferencesokbutton_clicked (GtkButto Line 512  on_preferencesokbutton_clicked (GtkButto
512    else    else
513            hamlibwidgets =       whichhamlibwidgets (frequencyyesno, smeteryesno);            hamlibwidgets =       whichhamlibwidgets (frequencyyesno, smeteryesno);
514    
515    if (hamlib_changed (hamlibwidgets, radio, device, atoi(pollstr), rigconf,    if (hamlib_changed (hamlibwidgets, radio, device, atoi(pollstr), rigconf))
     atoi(digits)))  
516    {    {
517            if (preferences.hamlib > 0) stop_hamlib ();            if (preferences.hamlib > 0) stop_hamlib ();
518      preferences.rigconf = g_strdup (rigconf);      preferences.rigconf = g_strdup (rigconf);
                 preferences.round = atoi (digits);  
519                  hamlibresult = start_hamlib (radio, device, RIG_DEBUG_NONE, atoi (pollstr));                  hamlibresult = start_hamlib (radio, device, RIG_DEBUG_NONE, atoi (pollstr));
520                  if (hamlibresult)                  if (hamlibresult)
521                  {                  {
# Line 542  on_preferencesokbutton_clicked (GtkButto Line 538  on_preferencesokbutton_clicked (GtkButto
538      }      }
539    }    }
540          sethamlibwidgets (hamlibwidgets);          sethamlibwidgets (hamlibwidgets);
541            preferences.round = atoi (digits);
542          preferences.hamlib = hamlibwidgets;          preferences.hamlib = hamlibwidgets;
543  #endif  #endif
544    

Legend:
Removed from v.1.20  
changed lines
  Added in v.1.21

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26