From 8c03b235233c3f5395a852c124857a267f2ba6a0 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Mon, 15 Feb 2016 18:02:46 +0100 Subject: [PATCH] Migrazione a libzakautho e libzakauthe. --- configure.ac | 11 ++++--- src/commons.h | 10 +++--- src/main.c | 60 ++++++++++++++++++------------------ src/nodi.c | 14 ++++----- src/nodo.c | 12 ++++---- src/persona.c | 12 ++++---- src/personaincarico.c | 12 ++++---- src/personanodo.c | 12 ++++---- src/personanodorecapito.c | 12 ++++---- src/personarecapito.c | 12 ++++---- src/personaufficio.c | 12 ++++---- src/personaufficiorecapito.c | 12 ++++---- src/persone.c | 12 ++++---- src/posizioneeconomica.c | 12 ++++---- src/posizionieconomiche.c | 12 ++++---- src/profiliprofessionali.c | 12 ++++---- src/profiloprofessionale.c | 12 ++++---- src/ruoli.c | 12 ++++---- src/ruolo.c | 12 ++++---- src/struttura.c | 12 ++++---- src/strutturaallegato.c | 12 ++++---- src/strutturacollegamento.c | 12 ++++---- src/strutturaindirizzo.c | 12 ++++---- src/strutture.c | 12 ++++---- src/tipinodo.c | 14 ++++----- src/tipiprestazione.c | 12 ++++---- src/tipirapportolavoro.c | 12 ++++---- src/tipirecapito.c | 14 ++++----- src/tiponodo.c | 12 ++++---- src/tipoprestazione.c | 12 ++++---- src/tiporapportolavoro.c | 12 ++++---- src/tiporecapito.c | 12 ++++---- src/titoli.c | 12 ++++---- src/titolo.c | 12 ++++---- src/uffici.c | 12 ++++---- src/ufficio.c | 12 ++++---- src/ufficioallegato.c | 12 ++++---- src/ufficiocollegamento.c | 12 ++++---- src/ufficionodo.c | 12 ++++---- src/ufficioorario.c | 12 ++++---- src/ufficiorecapito.c | 12 ++++---- src/ufficiostanza.c | 12 ++++---- 42 files changed, 278 insertions(+), 277 deletions(-) diff --git a/configure.ac b/configure.ac index 662c360..0fec592 100644 --- a/configure.ac +++ b/configure.ac @@ -43,11 +43,12 @@ AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) # Checks for libraries. PKG_CHECK_MODULES(ORGANIGRAMMA, [gio-2.0 >= 2.36 - gtk+-3.0 >= 3.0 - libgtkform >= 0.5.0 - libaute >= 0.0.2 - libterritorio >= 0.0.1 - libpq]) + gtk+-3.0 >= 3.0 + libgtkform >= 0.5.0 + libzakauthe >= 0.0.2 + libzakautho >= 0.0.5 + libterritorio >= 0.0.1 + libpq]) AC_SUBST(ORGANIGRAMMA_CFLAGS) AC_SUBST(ORGANIGRAMMA_LIBS) diff --git a/src/commons.h b/src/commons.h index 1221a22..3e5ee65 100644 --- a/src/commons.h +++ b/src/commons.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2013 Andrea Zagli + * Copyright (C) 2010-2016 Andrea Zagli * * 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 @@ -32,8 +32,8 @@ #include #include -#include -#include +#include +#include #include #include @@ -52,8 +52,8 @@ typedef struct const gchar *guifile; const gchar *utente; - Autoz *autoz; - AutozIRole *role_utente; + ZakAutho *autoz; + ZakAuthoIRole *role_utente; Solipa *solipa; diff --git a/src/main.c b/src/main.c index 2fe9d6b..167f5dd 100644 --- a/src/main.c +++ b/src/main.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2013 Andrea Zagli + * Copyright (C) 2010-2016 Andrea Zagli * * 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 @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include #include @@ -250,7 +250,7 @@ main (int argc, char *argv[]) GdaConnection *gdacon; - Aute *aute; + ZakAuthe *aute; gchar **aute_params; gsize n_aute_params; GSList *sl_aute_params; @@ -280,7 +280,7 @@ main (int argc, char *argv[]) /* leggo i parametri per l'autenticazione */ error = NULL; - aute_params = g_key_file_get_keys (config, "AUTE", &n_aute_params, &error); + aute_params = g_key_file_get_keys (config, "ZAKAUTHE", &n_aute_params, &error); if (aute_params == NULL) { g_error ("Impossibile leggere la configurazione per il sistema di autenticazione."); @@ -290,18 +290,18 @@ main (int argc, char *argv[]) for (i = 0; i < n_aute_params; i++) { error = NULL; - sl_aute_params = g_slist_append (sl_aute_params, g_key_file_get_string (config, "AUTE", aute_params[i], &error)); + sl_aute_params = g_slist_append (sl_aute_params, g_key_file_get_string (config, "ZAKAUTHE", aute_params[i], &error)); } g_strfreev (aute_params); /* autenticazione */ - aute = aute_new (); - aute_set_config (aute, sl_aute_params); + aute = zak_authe_new (); + zak_authe_set_config (aute, sl_aute_params); while (TRUE) { - utente = aute_autentica (aute); + utente = zak_authe_authe (aute); if (utente == NULL) { @@ -364,12 +364,12 @@ main (int argc, char *argv[]) commons->guifile = g_build_filename (commons->guidir, "organigramma.gui", NULL); commons->territorio_commons->guifile = g_build_filename (commons->territorio_commons->guidir, "territorio.gui", NULL); - /* leggo i parametri per libautoz */ + /* leggo i parametri per libzakautho */ error = NULL; - cnc_string = g_key_file_get_value (config, "AUTOZ", "cnc_string", &error); + cnc_string = g_key_file_get_value (config, "ZAKAUTHO", "cnc_string", &error); if (cnc_string == NULL) { - g_warning ("Impossibile leggere la stringa di connessione per libautoz dal file di configurazione: %s.\n", error != NULL && error->message != NULL ? error->message : "nessun dettaglio"); + g_warning ("Impossibile leggere la stringa di connessione per libzakautho dal file di configurazione: %s.\n", error != NULL && error->message != NULL ? error->message : "nessun dettaglio"); return 0; } @@ -377,31 +377,31 @@ main (int argc, char *argv[]) gdacon = gda_connection_open_from_string (NULL, cnc_string, NULL, 0, &error); if (gdacon == NULL) { - g_warning ("Impossibile creare la connessione al db per libautoz: %s.\n", error != NULL && error->message != NULL ? error->message : "nessun dettaglio"); + g_warning ("Impossibile creare la connessione al db per libzakautho: %s.\n", error != NULL && error->message != NULL ? error->message : "nessun dettaglio"); return 0; } - commons->autoz = autoz_new (); + commons->autoz = zak_autho_new (); if (commons->autoz == NULL) { - g_warning ("Impossibile creare l'oggetto per libautoz."); + g_warning ("Impossibile creare l'oggetto per libzakautho."); return 0; } - if (!autoz_load_from_db (commons->autoz, gdacon, NULL, TRUE)) + if (!zak_autho_load_from_db (commons->autoz, gdacon, NULL, TRUE)) { - g_warning ("Impossibile caricare la configurazione per libautoz dal db."); + g_warning ("Impossibile caricare la configurazione per libzakautho dal db."); return 0; } - commons->role_utente = autoz_get_role_from_id (commons->autoz, commons->utente); + commons->role_utente = zak_autho_get_role_from_id (commons->autoz, commons->utente); if (commons->role_utente == NULL) { - g_warning ("Utente «%s» non trovato nell configurazione di libautoz.", commons->utente); + g_warning ("Utente «%s» non trovato nell configurazione di libzakautho.", commons->utente); return 0; } - if (!autoz_is_allowed (commons->autoz, commons->role_utente, autoz_get_resource_from_id (commons->autoz, "organigramma_ro"), FALSE) - && !autoz_is_allowed (commons->autoz, commons->role_utente, autoz_get_resource_from_id (commons->autoz, "organigramma_rw"), FALSE)) + if (!zak_autho_is_allowed (commons->autoz, commons->role_utente, zak_autho_get_resource_from_id (commons->autoz, "organigramma_ro"), FALSE) + && !zak_autho_is_allowed (commons->autoz, commons->role_utente, zak_autho_get_resource_from_id (commons->autoz, "organigramma_rw"), FALSE)) { g_critical ("Non si è autorizzati all'utilizzo di questa applicazione."); return 0; @@ -476,10 +476,10 @@ main (int argc, char *argv[]) /* leggo i parametri per libautoz di territorio */ error = NULL; - cnc_string = g_key_file_get_value (config, "AUTOZ_TERRITORIO", "cnc_string", &error); + cnc_string = g_key_file_get_value (config, "ZAKAUTHO_TERRITORIO", "cnc_string", &error); if (cnc_string == NULL) { - g_warning ("Impossibile leggere la stringa di connessione per libautoz dal file di configurazione: %s.\n", error != NULL && error->message != NULL ? error->message : "nessun dettaglio"); + g_warning ("Impossibile leggere la stringa di connessione per libzakautho dal file di configurazione: %s.\n", error != NULL && error->message != NULL ? error->message : "nessun dettaglio"); return 0; } @@ -487,26 +487,26 @@ main (int argc, char *argv[]) gdacon = gda_connection_open_from_string (NULL, cnc_string, NULL, 0, &error); if (gdacon == NULL) { - g_warning ("Impossibile creare la connessione al db per libautoz di territorio: %s.\n", error != NULL && error->message != NULL ? error->message : "nessun dettaglio"); + g_warning ("Impossibile creare la connessione al db per libzakautho di territorio: %s.\n", error != NULL && error->message != NULL ? error->message : "nessun dettaglio"); return 0; } - commons->territorio_commons->autoz = autoz_new (); + commons->territorio_commons->autoz = zak_autho_new (); if (commons->territorio_commons->autoz == NULL) { - g_warning ("Impossibile creare l'oggetto per libautoz."); + g_warning ("Impossibile creare l'oggetto per libzakautho."); return 0; } - if (!autoz_load_from_db (commons->territorio_commons->autoz, gdacon, NULL, TRUE)) + if (!zak_autho_load_from_db (commons->territorio_commons->autoz, gdacon, NULL, TRUE)) { - g_warning ("Impossibile caricare la configurazione per libautoz dal db."); + g_warning ("Impossibile caricare la configurazione per libzakautho dal db."); return 0; } - commons->territorio_commons->role_utente = autoz_get_role_from_id (commons->territorio_commons->autoz, commons->territorio_commons->utente); + commons->territorio_commons->role_utente = zak_autho_get_role_from_id (commons->territorio_commons->autoz, commons->territorio_commons->utente); if (commons->territorio_commons->role_utente == NULL) { - g_warning ("Utente \"%s\" non trovato nell configurazione di libautoz.", commons->territorio_commons->utente); + g_warning ("Utente \"%s\" non trovato nell configurazione di libzakautho.", commons->territorio_commons->utente); return 0; } diff --git a/src/nodi.c b/src/nodi.c index c616d6c..8d921f8 100644 --- a/src/nodi.c +++ b/src/nodi.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2010-2013 Andrea Zagli +/* + * Copyright (C) 2010-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,7 +21,7 @@ #include #endif -#include +#include #include #include "nodi.h" @@ -130,7 +130,7 @@ OrganigrammaNodi *organigramma_nodi_new (OrganigrammaCommons *commons, gboolean selezione) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaNodi *a = ORGANIGRAMMA_NODI (g_object_new (organigramma_nodi_get_type (), NULL)); @@ -141,7 +141,7 @@ OrganigrammaNodi error = NULL; gtk_builder_add_objects_from_file (priv->commons->gtkbuilder, priv->commons->guifile, - g_strsplit (g_strconcat ("tstore_nodi|", + g_strsplit (g_strconcat ("tstore_nodi|", (selezione ? "w_nodi" : "vbx_nodi"), NULL), "|", -1), &error); @@ -189,8 +189,8 @@ OrganigrammaNodi organigramma_nodi_carica (a); - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button1")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button3")), FALSE); diff --git a/src/nodo.c b/src/nodo.c index 8bf3736..51fe8ff 100644 --- a/src/nodo.c +++ b/src/nodo.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2010-2013 Andrea Zagli +/* + * Copyright (C) 2010-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,7 +21,7 @@ #include #endif -#include +#include #include #include @@ -131,7 +131,7 @@ OrganigrammaNodo *organigramma_nodo_new (OrganigrammaCommons *commons, gint id) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaNodo *a = ORGANIGRAMMA_NODO (g_object_new (organigramma_nodo_get_type (), NULL)); @@ -192,8 +192,8 @@ OrganigrammaNodo organigramma_nodo_carica (a); } - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button5")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button152")), FALSE); diff --git a/src/persona.c b/src/persona.c index a05752e..a6ad87b 100644 --- a/src/persona.c +++ b/src/persona.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2010-2013 Andrea Zagli +/* + * Copyright (C) 2010-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,7 +21,7 @@ #include #endif -#include +#include #include #include #include @@ -286,7 +286,7 @@ OrganigrammaPersona *organigramma_persona_new (OrganigrammaCommons *commons, gint id) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaPersona *a = ORGANIGRAMMA_PERSONA (g_object_new (organigramma_persona_get_type (), NULL)); @@ -426,8 +426,8 @@ OrganigrammaPersona organigramma_persona_carica (a); } - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button79")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button81")), FALSE); diff --git a/src/personaincarico.c b/src/personaincarico.c index d22f937..4033145 100644 --- a/src/personaincarico.c +++ b/src/personaincarico.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2009-2013 Andrea Zagli +/* + * Copyright (C) 2009-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,7 +21,7 @@ #include #endif -#include +#include #include #include @@ -125,7 +125,7 @@ OrganigrammaPersonaIncarico *organigramma_persona_incarico_new (OrganigrammaCommons *commons, guint id, guint id_persone) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaPersonaIncarico *a = ORGANIGRAMMA_PERSONA_INCARICO (g_object_new (organigramma_persona_incarico_get_type (), NULL)); @@ -185,8 +185,8 @@ OrganigrammaPersonaIncarico organigramma_persona_incarico_carica (a); } - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button99")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button158")), FALSE); diff --git a/src/personanodo.c b/src/personanodo.c index 38c70d1..6589c90 100644 --- a/src/personanodo.c +++ b/src/personanodo.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2009-2013 Andrea Zagli +/* + * Copyright (C) 2009-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,7 +21,7 @@ #include #endif -#include +#include #include #include @@ -130,7 +130,7 @@ OrganigrammaPersonaNodo *organigramma_persona_nodo_new (OrganigrammaCommons *commons, guint id, guint id_persone) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaPersonaNodo *a = ORGANIGRAMMA_PERSONA_NODO (g_object_new (organigramma_persona_nodo_get_type (), NULL)); @@ -190,8 +190,8 @@ OrganigrammaPersonaNodo organigramma_persona_nodo_carica (a); } - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button92")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button159")), FALSE); diff --git a/src/personanodorecapito.c b/src/personanodorecapito.c index 3794dce..68aef7b 100644 --- a/src/personanodorecapito.c +++ b/src/personanodorecapito.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2009-2013 Andrea Zagli +/* + * Copyright (C) 2009-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,7 +21,7 @@ #include #endif -#include +#include #include #include @@ -126,7 +126,7 @@ OrganigrammaPersonaNodoRecapito *organigramma_persona_nodo_recapito_new (OrganigrammaCommons *commons, guint id, guint id_persone, guint id_nodi) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaPersonaNodoRecapito *a = ORGANIGRAMMA_PERSONA_NODO_RECAPITO (g_object_new (organigramma_persona_nodo_recapito_get_type (), NULL)); @@ -185,8 +185,8 @@ OrganigrammaPersonaNodoRecapito organigramma_persona_nodo_recapito_carica (a); } - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button94")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button160")), FALSE); diff --git a/src/personarecapito.c b/src/personarecapito.c index 98da9f9..8248ded 100644 --- a/src/personarecapito.c +++ b/src/personarecapito.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2009-2013 Andrea Zagli +/* + * Copyright (C) 2009-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,7 +21,7 @@ #include #endif -#include +#include #include #include @@ -124,7 +124,7 @@ OrganigrammaPersonaRecapito *organigramma_persona_recapito_new (OrganigrammaCommons *commons, guint id, guint id_persone) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaPersonaRecapito *a = ORGANIGRAMMA_PERSONA_RECAPITO (g_object_new (organigramma_persona_recapito_get_type (), NULL)); @@ -181,8 +181,8 @@ OrganigrammaPersonaRecapito organigramma_persona_recapito_carica (a); } - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button88")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button163")), FALSE); diff --git a/src/personaufficio.c b/src/personaufficio.c index d079b12..7f8511c 100644 --- a/src/personaufficio.c +++ b/src/personaufficio.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2009-2013 Andrea Zagli +/* + * Copyright (C) 2009-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,7 +21,7 @@ #include #endif -#include +#include #include #include #include @@ -136,7 +136,7 @@ OrganigrammaPersonaUfficio *organigramma_persona_ufficio_new (OrganigrammaCommons *commons, guint id, guint id_persone) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaPersonaUfficio *a = ORGANIGRAMMA_PERSONA_UFFICIO (g_object_new (organigramma_persona_ufficio_get_type (), NULL)); @@ -199,8 +199,8 @@ OrganigrammaPersonaUfficio organigramma_persona_ufficio_carica (a); } - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button84")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button161")), FALSE); diff --git a/src/personaufficiorecapito.c b/src/personaufficiorecapito.c index c6f76f1..3eb6b49 100644 --- a/src/personaufficiorecapito.c +++ b/src/personaufficiorecapito.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2009-2013 Andrea Zagli +/* + * Copyright (C) 2009-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,7 +21,7 @@ #include #endif -#include +#include #include #include @@ -126,7 +126,7 @@ OrganigrammaPersonaUfficioRecapito *organigramma_persona_ufficio_recapito_new (OrganigrammaCommons *commons, guint id, guint id_persone, guint id_uffici) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaPersonaUfficioRecapito *a = ORGANIGRAMMA_PERSONA_UFFICIO_RECAPITO (g_object_new (organigramma_persona_ufficio_recapito_get_type (), NULL)); @@ -183,8 +183,8 @@ OrganigrammaPersonaUfficioRecapito organigramma_persona_ufficio_recapito_carica (a); } - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button86")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button162")), FALSE); diff --git a/src/persone.c b/src/persone.c index 199df0e..afe16d4 100644 --- a/src/persone.c +++ b/src/persone.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2010-2012 Andrea Zagli +/* + * Copyright (C) 2010-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,7 +17,7 @@ * */ -#include +#include #include #include "persone.h" @@ -127,7 +127,7 @@ OrganigrammaPersone guint id_uffici, GDateTime *when) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaPersone *a = ORGANIGRAMMA_PERSONE (g_object_new (organigramma_persone_get_type (), NULL)); @@ -195,8 +195,8 @@ OrganigrammaPersone organigramma_persone_carica (a); - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button102")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button104")), FALSE); diff --git a/src/posizioneeconomica.c b/src/posizioneeconomica.c index d17ab7c..82d055c 100644 --- a/src/posizioneeconomica.c +++ b/src/posizioneeconomica.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2010-2013 Andrea Zagli +/* + * Copyright (C) 2010-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,7 +21,7 @@ #include #endif -#include +#include #include #include @@ -121,7 +121,7 @@ OrganigrammaPosizioneEconomica *organigramma_posizione_economica_new (OrganigrammaCommons *commons, gint id) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaPosizioneEconomica *a = POSIZIONE_ECONOMICA (g_object_new (organigramma_posizione_economica_get_type (), NULL)); @@ -173,8 +173,8 @@ OrganigrammaPosizioneEconomica organigramma_posizione_economica_carica (a); } - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button122")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button147")), FALSE); diff --git a/src/posizionieconomiche.c b/src/posizionieconomiche.c index 01e1d5e..36dc2de 100644 --- a/src/posizionieconomiche.c +++ b/src/posizionieconomiche.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2010-2012 Andrea Zagli +/* + * Copyright (C) 2010-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,7 +17,7 @@ * */ -#include +#include #include #include "posizionieconomiche.h" @@ -123,7 +123,7 @@ OrganigrammaPosizioniEconomiche *organigramma_posizioni_economiche_new (OrganigrammaCommons *commons, gboolean selezione) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaPosizioniEconomiche *a = ORGANIGRAMMA_POSIZIONI_ECONOMICHE (g_object_new (organigramma_posizioni_economiche_get_type (), NULL)); @@ -182,8 +182,8 @@ OrganigrammaPosizioniEconomiche organigramma_posizioni_economiche_carica (a); - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button116")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button118")), FALSE); diff --git a/src/profiliprofessionali.c b/src/profiliprofessionali.c index c6955b1..0b3bad1 100644 --- a/src/profiliprofessionali.c +++ b/src/profiliprofessionali.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2010-2012 Andrea Zagli +/* + * Copyright (C) 2010-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,7 +17,7 @@ * */ -#include +#include #include #include "profiliprofessionali.h" @@ -125,7 +125,7 @@ OrganigrammaProfiliProfessionali *organigramma_profili_professionali_new (OrganigrammaCommons *commons, gboolean selezione) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaProfiliProfessionali *a = ORGANIGRAMMA_PROFILI_PROFESSIONALI (g_object_new (organigramma_profili_professionali_get_type (), NULL)); @@ -175,8 +175,8 @@ OrganigrammaProfiliProfessionali organigramma_profili_professionali_carica (a); - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button130")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button132")), FALSE); diff --git a/src/profiloprofessionale.c b/src/profiloprofessionale.c index 4bde7db..6f1429d 100644 --- a/src/profiloprofessionale.c +++ b/src/profiloprofessionale.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2010-2013 Andrea Zagli +/* + * Copyright (C) 2010-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,7 +21,7 @@ #include #endif -#include +#include #include #include #include @@ -122,7 +122,7 @@ OrganigrammaProfiloProfessionale *organigramma_profilo_professionale_new (OrganigrammaCommons *commons, gint id) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaProfiloProfessionale *a = ORGANIGRAMMA_PROFILO_PROFESSIONALE (g_object_new (organigramma_profilo_professionale_get_type (), NULL)); @@ -174,8 +174,8 @@ OrganigrammaProfiloProfessionale organigramma_profilo_professionale_carica (a); } - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button136")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button148")), FALSE); diff --git a/src/ruoli.c b/src/ruoli.c index 1be0cf8..10c6e84 100644 --- a/src/ruoli.c +++ b/src/ruoli.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2013 Andrea Zagli +/* + * Copyright (C) 2013-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,7 +17,7 @@ * */ -#include +#include #include #include "ruoli.h" @@ -123,7 +123,7 @@ OrganigrammaRuoli *organigramma_ruoli_new (OrganigrammaCommons *commons, gboolean selezione) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaRuoli *a = ORGANIGRAMMA_RUOLI (g_object_new (organigramma_ruoli_get_type (), NULL)); @@ -182,8 +182,8 @@ OrganigrammaRuoli organigramma_ruoli_carica (a); - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button52")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button168")), FALSE); diff --git a/src/ruolo.c b/src/ruolo.c index 8a20e02..8612e72 100644 --- a/src/ruolo.c +++ b/src/ruolo.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2013 Andrea Zagli +/* + * Copyright (C) 2013-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,7 +21,7 @@ #include #endif -#include +#include #include #include @@ -121,7 +121,7 @@ OrganigrammaRuolo *organigramma_ruolo_new (OrganigrammaCommons *commons, gint id) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaRuolo *a = ORGANIGRAMMA_RUOLO (g_object_new (organigramma_ruolo_get_type (), NULL)); @@ -173,8 +173,8 @@ OrganigrammaRuolo organigramma_ruolo_carica (a); } - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button172")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button173")), FALSE); diff --git a/src/struttura.c b/src/struttura.c index a602600..ec5f640 100644 --- a/src/struttura.c +++ b/src/struttura.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2010-2013 Andrea Zagli +/* + * Copyright (C) 2010-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,7 +23,7 @@ #include -#include +#include #include #include #include @@ -207,7 +207,7 @@ OrganigrammaStruttura *organigramma_struttura_new (OrganigrammaCommons *commons, gint id) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaStruttura *a = ORGANIGRAMMA_STRUTTURA (g_object_new (organigramma_struttura_get_type (), NULL)); @@ -315,8 +315,8 @@ OrganigrammaStruttura organigramma_struttura_carica (a); } - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button47")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button51")), FALSE); diff --git a/src/strutturaallegato.c b/src/strutturaallegato.c index f10f304..9ddad88 100644 --- a/src/strutturaallegato.c +++ b/src/strutturaallegato.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2013 Andrea Zagli +/* + * Copyright (C) 2013-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include "strutturaallegato.h" @@ -122,7 +122,7 @@ OrganigrammaStrutturaAllegato *organigramma_struttura_allegato_new (OrganigrammaCommons *commons, guint id, guint id_strutture) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaStrutturaAllegato *a = ORGANIGRAMMA_STRUTTURA_ALLEGATO (g_object_new (organigramma_struttura_allegato_get_type (), NULL)); @@ -194,8 +194,8 @@ OrganigrammaStrutturaAllegato organigramma_struttura_allegato_carica (a); } - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button189")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button190")), FALSE); diff --git a/src/strutturacollegamento.c b/src/strutturacollegamento.c index b3e49eb..3991811 100644 --- a/src/strutturacollegamento.c +++ b/src/strutturacollegamento.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2013 Andrea Zagli +/* + * Copyright (C) 2013-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,7 +18,7 @@ */ #include -#include +#include #include #include "strutturacollegamento.h" @@ -119,7 +119,7 @@ OrganigrammaStrutturaCollegamento *organigramma_struttura_collegamento_new (OrganigrammaCommons *commons, guint id, guint id_uffici) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaStrutturaCollegamento *a = ORGANIGRAMMA_STRUTTURA_COLLEGAMENTO (g_object_new (organigramma_struttura_collegamento_get_type (), NULL)); @@ -176,8 +176,8 @@ OrganigrammaStrutturaCollegamento organigramma_struttura_collegamento_carica (a); } - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button186")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button187")), FALSE); diff --git a/src/strutturaindirizzo.c b/src/strutturaindirizzo.c index 7b3331c..bb63cbf 100644 --- a/src/strutturaindirizzo.c +++ b/src/strutturaindirizzo.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2009-2013 Andrea Zagli +/* + * Copyright (C) 2009-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,7 +21,7 @@ #include #endif -#include +#include #include #include #include @@ -129,7 +129,7 @@ OrganigrammaStrutturaIndirizzo *organigramma_struttura_indirizzo_new (OrganigrammaCommons *commons, guint id, guint id_strutture) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaStrutturaIndirizzo *a = ORGANIGRAMMA_STRUTTURA_INDIRIZZO (g_object_new (organigramma_struttura_indirizzo_get_type (), NULL)); @@ -191,8 +191,8 @@ OrganigrammaStrutturaIndirizzo organigramma_struttura_indirizzo_carica (a); } - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button56")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button150")), FALSE); diff --git a/src/strutture.c b/src/strutture.c index c854191..2ce6524 100644 --- a/src/strutture.c +++ b/src/strutture.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2010-2012 Andrea Zagli +/* + * Copyright (C) 2010-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,7 +17,7 @@ * */ -#include +#include #include #include "strutture.h" @@ -123,7 +123,7 @@ OrganigrammaStrutture *organigramma_strutture_new (OrganigrammaCommons *commons, gboolean selezione) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaStrutture *a = ORGANIGRAMMA_STRUTTURE (g_object_new (organigramma_strutture_get_type (), NULL)); @@ -182,8 +182,8 @@ OrganigrammaStrutture organigramma_strutture_carica (a); - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button32")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button34")), FALSE); diff --git a/src/tipinodo.c b/src/tipinodo.c index 3b6472e..7733baa 100644 --- a/src/tipinodo.c +++ b/src/tipinodo.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2010-2012 Andrea Zagli +/* + * Copyright (C) 2010-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,7 +17,7 @@ * */ -#include +#include #include #include "tipinodo.h" @@ -125,7 +125,7 @@ OrganigrammaTipiNodo *organigramma_tipi_nodo_new (OrganigrammaCommons *commons, gboolean selezione) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaTipiNodo *a = ORGANIGRAMMA_TIPI_NODO (g_object_new (organigramma_tipi_nodo_get_type (), NULL)); @@ -136,7 +136,7 @@ OrganigrammaTipiNodo error = NULL; gtk_builder_add_objects_from_file (priv->commons->gtkbuilder, priv->commons->guifile, - g_strsplit (g_strconcat ("lstore_tipi_nodo|", + g_strsplit (g_strconcat ("lstore_tipi_nodo|", (selezione ? "w_tipi_nodo" : "vbx_tipi_nodo"), NULL), "|", -1), &error); @@ -175,8 +175,8 @@ OrganigrammaTipiNodo organigramma_tipi_nodo_carica (a); - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button7")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button11")), FALSE); diff --git a/src/tipiprestazione.c b/src/tipiprestazione.c index 15d9922..32bcf3c 100644 --- a/src/tipiprestazione.c +++ b/src/tipiprestazione.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2010-2012 Andrea Zagli +/* + * Copyright (C) 2010-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,7 +17,7 @@ * */ -#include +#include #include #include "tipiprestazione.h" @@ -125,7 +125,7 @@ OrganigrammaTipiPrestazione *organigramma_tipi_prestazione_new (OrganigrammaCommons *commons, gboolean selezione) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaTipiPrestazione *a = ORGANIGRAMMA_TIPI_PRESTAZIONE (g_object_new (organigramma_tipi_prestazione_get_type (), NULL)); @@ -175,8 +175,8 @@ OrganigrammaTipiPrestazione organigramma_tipi_prestazione_carica (a); - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button123")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button125")), FALSE); diff --git a/src/tipirapportolavoro.c b/src/tipirapportolavoro.c index a9fafb5..43e49e6 100644 --- a/src/tipirapportolavoro.c +++ b/src/tipirapportolavoro.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2010-2012 Andrea Zagli +/* + * Copyright (C) 2010-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,7 +17,7 @@ * */ -#include +#include #include #include "tipirapportolavoro.h" @@ -123,7 +123,7 @@ OrganigrammaTipiRapportoLavoro *organigramma_tipi_rapporto_lavoro_new (OrganigrammaCommons *commons, gboolean selezione) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaTipiRapportoLavoro *a = ORGANIGRAMMA_TIPI_RAPPORTO_LAVORO (g_object_new (organigramma_tipi_rapporto_lavoro_get_type (), NULL)); @@ -182,8 +182,8 @@ OrganigrammaTipiRapportoLavoro organigramma_tipi_rapporto_lavoro_carica (a); - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button109")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button111")), FALSE); diff --git a/src/tipirecapito.c b/src/tipirecapito.c index 2e83ab8..5f15ff1 100644 --- a/src/tipirecapito.c +++ b/src/tipirecapito.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2010-2012 Andrea Zagli +/* + * Copyright (C) 2010-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,7 +17,7 @@ * */ -#include +#include #include #include "tipirecapito.h" @@ -123,7 +123,7 @@ OrganigrammaTipiRecapito *organigramma_tipi_recapito_new (OrganigrammaCommons *commons, gboolean selezione) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaTipiRecapito *a = ORGANIGRAMMA_TIPI_RECAPITO (g_object_new (organigramma_tipi_recapito_get_type (), NULL)); @@ -134,7 +134,7 @@ OrganigrammaTipiRecapito error = NULL; gtk_builder_add_objects_from_file (priv->commons->gtkbuilder, priv->commons->guifile, - g_strsplit (g_strconcat ("lstore_tipi_recapito|", + g_strsplit (g_strconcat ("lstore_tipi_recapito|", (selezione ? "w_tipi_recapito" : "vbx_tipi_recapito"), NULL), "|", -1), &error); @@ -182,8 +182,8 @@ OrganigrammaTipiRecapito organigramma_tipi_recapito_carica (a); - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button16")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button18")), FALSE); diff --git a/src/tiponodo.c b/src/tiponodo.c index c05a8e4..18edaea 100644 --- a/src/tiponodo.c +++ b/src/tiponodo.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2010-2013 Andrea Zagli +/* + * Copyright (C) 2010-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,7 +21,7 @@ #include #endif -#include +#include #include #include #include @@ -122,7 +122,7 @@ OrganigrammaTipoNodo *organigramma_tipo_nodo_new (OrganigrammaCommons *commons, gint id) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaTipoNodo *a = ORGANIGRAMMA_TIPO_NODO (g_object_new (organigramma_tipo_nodo_get_type (), NULL)); @@ -174,8 +174,8 @@ OrganigrammaTipoNodo organigramma_tipo_nodo_carica (a); } - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button9")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button142")), FALSE); diff --git a/src/tipoprestazione.c b/src/tipoprestazione.c index 1cd8505..c1c19f7 100644 --- a/src/tipoprestazione.c +++ b/src/tipoprestazione.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2010-2013 Andrea Zagli +/* + * Copyright (C) 2010-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,7 +21,7 @@ #include #endif -#include +#include #include #include #include @@ -122,7 +122,7 @@ OrganigrammaTipoPrestazione *organigramma_tipo_prestazione_new (OrganigrammaCommons *commons, gint id) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaTipoPrestazione *a = ORGANIGRAMMA_TIPO_PRESTAZIONE (g_object_new (organigramma_tipo_prestazione_get_type (), NULL)); @@ -174,8 +174,8 @@ OrganigrammaTipoPrestazione organigramma_tipo_prestazione_carica (a); } - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button129")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button143")), FALSE); diff --git a/src/tiporapportolavoro.c b/src/tiporapportolavoro.c index 4e76a12..b21f398 100644 --- a/src/tiporapportolavoro.c +++ b/src/tiporapportolavoro.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2010-2013 Andrea Zagli +/* + * Copyright (C) 2010-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,7 +21,7 @@ #include #endif -#include +#include #include #include @@ -121,7 +121,7 @@ OrganigrammaTipoRapportoLavoro *organigramma_tipo_rapporto_lavoro_new (OrganigrammaCommons *commons, gint id) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaTipoRapportoLavoro *a = ORGANIGRAMMA_TIPO_RAPPORTO_LAVORO (g_object_new (organigramma_tipo_rapporto_lavoro_get_type (), NULL)); @@ -173,8 +173,8 @@ OrganigrammaTipoRapportoLavoro organigramma_tipo_rapporto_lavoro_carica (a); } - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button115")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button144")), FALSE); diff --git a/src/tiporecapito.c b/src/tiporecapito.c index fbe4e44..cdb8057 100644 --- a/src/tiporecapito.c +++ b/src/tiporecapito.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2010-2013 Andrea Zagli +/* + * Copyright (C) 2010-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,7 +23,7 @@ #include -#include +#include #include #include @@ -124,7 +124,7 @@ OrganigrammaTipoRecapito *organigramma_tipo_recapito_new (OrganigrammaCommons *commons, gint id) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaTipoRecapito *a = ORGANIGRAMMA_TIPO_RECAPITO (g_object_new (organigramma_tipo_recapito_get_type (), NULL)); @@ -186,8 +186,8 @@ OrganigrammaTipoRecapito organigramma_tipo_recapito_carica (a); } - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button22")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button145")), FALSE); diff --git a/src/titoli.c b/src/titoli.c index a0a3757..188c595 100644 --- a/src/titoli.c +++ b/src/titoli.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2010-2013 Andrea Zagli +/* + * Copyright (C) 2010-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,7 +21,7 @@ #include #endif -#include +#include #include #include "titoli.h" @@ -128,7 +128,7 @@ OrganigrammaTitoli *organigramma_titoli_new (OrganigrammaCommons *commons, gboolean selezione) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaTitoli *a = ORGANIGRAMMA_TITOLI (g_object_new (organigramma_titoli_get_type (), NULL)); @@ -187,8 +187,8 @@ OrganigrammaTitoli organigramma_titoli_carica (a); - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button95")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button97")), FALSE); diff --git a/src/titolo.c b/src/titolo.c index 14ae919..6b35918 100644 --- a/src/titolo.c +++ b/src/titolo.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2010-2013 Andrea Zagli +/* + * Copyright (C) 2010-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,7 +21,7 @@ #include #endif -#include +#include #include #include @@ -121,7 +121,7 @@ OrganigrammaTitolo *organigramma_titolo_new (OrganigrammaCommons *commons, gint id) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaTitolo *a = ORGANIGRAMMA_TITOLO (g_object_new (organigramma_titolo_get_type (), NULL)); @@ -173,8 +173,8 @@ OrganigrammaTitolo organigramma_titolo_carica (a); } - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button106")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button146")), FALSE); diff --git a/src/uffici.c b/src/uffici.c index 24efa31..583e28e 100644 --- a/src/uffici.c +++ b/src/uffici.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2010-2013 Andrea Zagli +/* + * Copyright (C) 2010-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,7 +21,7 @@ #include #endif -#include +#include #include #include "uffici.h" @@ -149,7 +149,7 @@ OrganigrammaUffici *organigramma_uffici_new (OrganigrammaCommons *commons, gboolean selezione) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaUffici *a = ORGANIGRAMMA_UFFICI (g_object_new (organigramma_uffici_get_type (), NULL)); @@ -212,8 +212,8 @@ OrganigrammaUffici organigramma_uffici_carica (a); } - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button23")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button25")), FALSE); diff --git a/src/ufficio.c b/src/ufficio.c index 846da7d..235705e 100644 --- a/src/ufficio.c +++ b/src/ufficio.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2010-2013 Andrea Zagli +/* + * Copyright (C) 2010-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,7 +23,7 @@ #include -#include +#include #include #include #include @@ -315,7 +315,7 @@ OrganigrammaUfficio *organigramma_ufficio_new (OrganigrammaCommons *commons, gint id) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaUfficio *a = ORGANIGRAMMA_UFFICIO (g_object_new (organigramma_ufficio_get_type (), NULL)); @@ -471,8 +471,8 @@ OrganigrammaUfficio organigramma_ufficio_carica (a); } - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button28")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button43")), FALSE); diff --git a/src/ufficioallegato.c b/src/ufficioallegato.c index c47bcf2..c4efa88 100644 --- a/src/ufficioallegato.c +++ b/src/ufficioallegato.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2013 Andrea Zagli +/* + * Copyright (C) 2013-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include "ufficioallegato.h" @@ -122,7 +122,7 @@ OrganigrammaUfficioAllegato *organigramma_ufficio_allegato_new (OrganigrammaCommons *commons, guint id, guint id_strutture) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaUfficioAllegato *a = ORGANIGRAMMA_UFFICIO_ALLEGATO (g_object_new (organigramma_ufficio_allegato_get_type (), NULL)); @@ -194,8 +194,8 @@ OrganigrammaUfficioAllegato organigramma_ufficio_allegato_carica (a); } - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button196")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button197")), FALSE); diff --git a/src/ufficiocollegamento.c b/src/ufficiocollegamento.c index 0210241..d3e8404 100644 --- a/src/ufficiocollegamento.c +++ b/src/ufficiocollegamento.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2013 Andrea Zagli +/* + * Copyright (C) 2013-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,7 +18,7 @@ */ #include -#include +#include #include #include "ufficiocollegamento.h" @@ -119,7 +119,7 @@ OrganigrammaUfficioCollegamento *organigramma_ufficio_collegamento_new (OrganigrammaCommons *commons, guint id, guint id_uffici) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaUfficioCollegamento *a = ORGANIGRAMMA_UFFICIO_COLLEGAMENTO (g_object_new (organigramma_ufficio_collegamento_get_type (), NULL)); @@ -176,8 +176,8 @@ OrganigrammaUfficioCollegamento organigramma_ufficio_collegamento_carica (a); } - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button175")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button176")), FALSE); diff --git a/src/ufficionodo.c b/src/ufficionodo.c index fe4434b..d9c5d54 100644 --- a/src/ufficionodo.c +++ b/src/ufficionodo.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2009-2013 Andrea Zagli +/* + * Copyright (C) 2009-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,7 +21,7 @@ #include #endif -#include +#include #include #include @@ -129,7 +129,7 @@ OrganigrammaUfficioNodo *organigramma_ufficio_nodo_new (OrganigrammaCommons *commons, guint id, guint id_uffici) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaUfficioNodo *a = ORGANIGRAMMA_UFFICIO_NODO (g_object_new (organigramma_ufficio_nodo_get_type (), NULL)); @@ -188,8 +188,8 @@ OrganigrammaUfficioNodo organigramma_ufficio_nodo_carica (a); } - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button46")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button154")), FALSE); diff --git a/src/ufficioorario.c b/src/ufficioorario.c index e47fcf2..54df4b6 100644 --- a/src/ufficioorario.c +++ b/src/ufficioorario.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2009-2013 Andrea Zagli +/* + * Copyright (C) 2009-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,7 +21,7 @@ #include #endif -#include +#include #include #include @@ -124,7 +124,7 @@ OrganigrammaUfficioOrario *organigramma_ufficio_orario_new (OrganigrammaCommons *commons, guint id, guint id_uffici) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaUfficioOrario *a = ORGANIGRAMMA_UFFICIO_ORARIO (g_object_new (organigramma_ufficio_orario_get_type (), NULL)); @@ -179,8 +179,8 @@ OrganigrammaUfficioOrario organigramma_ufficio_orario_carica (a); } - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button58")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button155")), FALSE); diff --git a/src/ufficiorecapito.c b/src/ufficiorecapito.c index ecb1bd9..4f18c4d 100644 --- a/src/ufficiorecapito.c +++ b/src/ufficiorecapito.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2009-2013 Andrea Zagli +/* + * Copyright (C) 2009-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,7 +21,7 @@ #include #endif -#include +#include #include #include @@ -124,7 +124,7 @@ OrganigrammaUfficioRecapito *organigramma_ufficio_recapito_new (OrganigrammaCommons *commons, guint id, guint id_uffici) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaUfficioRecapito *a = ORGANIGRAMMA_UFFICIO_RECAPITO (g_object_new (organigramma_ufficio_recapito_get_type (), NULL)); @@ -179,8 +179,8 @@ OrganigrammaUfficioRecapito organigramma_ufficio_recapito_carica (a); } - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button49")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button156")), FALSE); diff --git a/src/ufficiostanza.c b/src/ufficiostanza.c index f9486f0..57a1d55 100644 --- a/src/ufficiostanza.c +++ b/src/ufficiostanza.c @@ -1,5 +1,5 @@ -/* - * Copyright (C) 2009-2013 Andrea Zagli +/* + * Copyright (C) 2009-2016 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,7 +21,7 @@ #include #endif -#include +#include #include #include @@ -124,7 +124,7 @@ OrganigrammaUfficioStanza *organigramma_ufficio_stanza_new (OrganigrammaCommons *commons, guint id, guint id_uffici) { GError *error; - AutozIResource *ires1; + ZakAuthoIResource *ires1; OrganigrammaUfficioStanza *a = ORGANIGRAMMA_UFFICIO_STANZA (g_object_new (organigramma_ufficio_stanza_get_type (), NULL)); @@ -179,8 +179,8 @@ OrganigrammaUfficioStanza organigramma_ufficio_stanza_carica (a); } - ires1 = autoz_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); - if (!autoz_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) + ires1 = zak_autho_get_resource_from_id (priv->commons->autoz, "organigramma_rw"); + if (!zak_autho_is_allowed (priv->commons->autoz, priv->commons->role_utente, ires1, FALSE)) { gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button139")), FALSE); gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (commons->gtkbuilder, "button157")), FALSE); -- 2.49.0