Savannah Git Hosting - mdk.git/commitdiff

diff --git a/mixgtk/mixgtk_widgets.c b/mixgtk/mixgtk_widgets.c

index 7e0b8dc9880dd7d02c55218d22b39142c4cb6a46..2bfff3436389f1e4b3eaed4c77d29b55380309db 100644 (file)

--- a/mixgtk/mixgtk_widgets.c

+++ b/mixgtk/mixgtk_widgets.c

/* -*-c-*- -------------- mixgtk_widgets.c :

* Implementation of the functions declared in mixgtk_widgets.h

* ------------------------------------------------------------------

- * Copyright (C) 2001, 2004, 2006, 2007 Free Software Foundation, Inc.

+ * Copyright (C) 2001, 2004, 2006, 2007, 2014 Free Software Foundation, Inc.

*

* This program is free software; you can redistribute it and/or modify

* it under the terms of the GNU General Public License as published by

GtkWidget *

mixgtk_widget_factory_get (mixgtk_dialog_id_t dlg, mixgtk_widget_id_t widget)

{

- g_assert (widget < WIDGET_NO_);

+ g_assert ((long)widget < WIDGET_NO_);

return mixgtk_widget_factory_get_child_by_name (dlg, names_[widget]);

}

if (!xml_[dlg]) init_xml_ (dlg);

return glade_xml_get_widget (xml_[dlg], name);

}

-

-

diff --git a/mixlib/mix_vm.c b/mixlib/mix_vm.c

index d2959f28e20f2094a1580eebc9bf6127db52e4ea..d714bbab68855610f244360570defc22635fddb1 100644 (file)

--- a/mixlib/mix_vm.c

+++ b/mixlib/mix_vm.c

/* -*-c-*- ------------------ mix_vm.c :

* Implementation of the functions declared in mix_vm.h

* ------------------------------------------------------------------

- * Copyright (C) 2000, 2001, 2004, 2007 Free Software Foundation, Inc.

+ * Copyright (C) 2000, 2001, 2004, 2007, 2014 Free Software Foundation, Inc.

*

* This program is free software; you can redistribute it and/or modify

* it under the terms of the GNU General Public License as published by

N_("Unknow error code")

};

- return errors[(code < 0 || code > MIX_VM_ERROR_UNEXPECTED)

- ? MIX_VM_ERROR_UNEXPECTED + 1 : code];

+ return errors[code > MIX_VM_ERROR_UNEXPECTED ?

+ MIX_VM_ERROR_UNEXPECTED + 1 : code];

}

/* Breakpoints */

diff --git a/mixlib/xmix_vm_handlers.c b/mixlib/xmix_vm_handlers.c

index a567f38063b2121516de6e2a2c9f5a198cf608b1..c96411675cffb466044ee7b594faa0ffdaffe928 100644 (file)

--- a/mixlib/xmix_vm_handlers.c

+++ b/mixlib/xmix_vm_handlers.c

gboolean

cmd_pline_ (mix_vm_cmd_dispatcher_t *dis, const gchar *arg)

{

- gulong line = 0;

+ glong line = 0;

const gchar *txt;

if (arg && strlen (arg)) line = atoi (arg);