DeforaOS/Panel
DeforaOS/Panel
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adapt to the new API for the Error class

Browse Source
This commit is contained in:
Pierre Pronchery 2015-11-22 23:49:50 +01:00
parent f1c58b74e5
commit 153909b557
19 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/applets/battery.c
View File

@ -486,12 +486,12 @@ static gboolean _battery_on_timeout(gpointer data)
if(_battery_get(battery, &level, &charging) == FALSE) if(_battery_get(battery, &level, &charging) == FALSE)
{ {
helper->error(NULL, error_get(), 1); helper->error(NULL, error_get(NULL), 1);
timeout = 0; timeout = 0;
} }
else if(level == error || level < 0.0) else if(level == error || level < 0.0)
{ {
helper->error(NULL, error_get(), 1); helper->error(NULL, error_get(NULL), 1);
timeout = 30000; timeout = 30000;
} }
else else

2
src/applets/bluetooth.c
View File

@ -222,7 +222,7 @@ static gboolean _bluetooth_on_timeout(gpointer data)
if(_bluetooth_get(bluetooth, &active) == FALSE) if(_bluetooth_get(bluetooth, &active) == FALSE)
{ {
bluetooth->helper->error(NULL, error_get(), 1); bluetooth->helper->error(NULL, error_get(NULL), 1);
_bluetooth_set(bluetooth, FALSE); _bluetooth_set(bluetooth, FALSE);
bluetooth->timeout = 0; bluetooth->timeout = 0;
return FALSE; return FALSE;

2
src/applets/brightness.c
View File

@ -219,7 +219,7 @@ static gboolean _brightness_get(Brightness * brightness, int * level)
/* FIXME not supported */ /* FIXME not supported */
*level = -1; *level = -1;
error_set("%s: %s", applet.name, strerror(ENOSYS)); error_set("%s: %s", applet.name, strerror(ENOSYS));
helper->error(NULL, error_get(), 1); helper->error(NULL, error_get(NULL), 1);
return FALSE; return FALSE;
#endif #endif
} }

2
src/applets/clock.c
View File

@ -134,7 +134,7 @@ static gboolean _clock_on_timeout(gpointer data)
{ {
error_set("%s: %s: %s", applet.name, "gettimeofday", error_set("%s: %s: %s", applet.name, "gettimeofday",
strerror(errno)); strerror(errno));
helper->error(NULL, error_get(), 1); helper->error(NULL, error_get(NULL), 1);
return TRUE; return TRUE;
} }
t = tv.tv_sec; t = tv.tv_sec;

2
src/applets/cpu.c
View File

@ -198,7 +198,7 @@ static gboolean _cpu_on_timeout(gpointer data)
if(_cpu_get(cpu, &level) == FALSE) if(_cpu_get(cpu, &level) == FALSE)
{ {
cpu->timeout = 0; cpu->timeout = 0;
helper->error(NULL, error_get(), 1); helper->error(NULL, error_get(NULL), 1);
return FALSE; return FALSE;
} }
_cpu_set(cpu, level); _cpu_set(cpu, level);

2
src/applets/cpufreq.c
View File

@ -178,7 +178,7 @@ static gboolean _cpufreq_on_timeout(gpointer data)
{ {
error_set("%s: %s: %s", applet.name, cpufreq->name, error_set("%s: %s: %s", applet.name, cpufreq->name,
strerror(errno)); strerror(errno));
helper->error(NULL, error_get(), 1); helper->error(NULL, error_get(NULL), 1);
return TRUE; return TRUE;
} }
snprintf(buf, sizeof(buf), "%4u", (unsigned int)freq); snprintf(buf, sizeof(buf), "%4u", (unsigned int)freq);

2
src/applets/gps.c
View File

@ -174,7 +174,7 @@ static gboolean _gps_on_timeout(gpointer data)
if(_gps_get(gps, &active) == FALSE) if(_gps_get(gps, &active) == FALSE)
{ {
gps->helper->error(NULL, error_get(), 1); gps->helper->error(NULL, error_get(NULL), 1);
_gps_set(gps, FALSE); _gps_set(gps, FALSE);
gps->timeout = 0; gps->timeout = 0;
return FALSE; return FALSE;

2
src/applets/gsm.c
View File

@ -202,7 +202,7 @@ static gboolean _gsm_on_timeout(gpointer data)
if(_gsm_get(gsm, &active) == FALSE) if(_gsm_get(gsm, &active) == FALSE)
{ {
gsm->helper->error(NULL, error_get(), 1); gsm->helper->error(NULL, error_get(NULL), 1);
_gsm_set(gsm, FALSE); _gsm_set(gsm, FALSE);
gsm->timeout = 0; gsm->timeout = 0;
return FALSE; return FALSE;

2
src/applets/memory.c
View File

@ -149,7 +149,7 @@ static gboolean _memory_on_timeout(gpointer data)
{ {
error_set("%s: %s: %s", applet.name, "sysinfo", error_set("%s: %s: %s", applet.name, "sysinfo",
strerror(errno)); strerror(errno));
return memory->helper->error(NULL, error_get(), TRUE); return memory->helper->error(NULL, error_get(NULL), TRUE);
} }
value = sy.sharedram; value = sy.sharedram;
value /= sy.totalram; value /= sy.totalram;

2
src/applets/menu.c
View File

@ -843,7 +843,7 @@ static void _idle_path(Menu * menu, char const * path, char const * apppath)
config_reset(config); config_reset(config);
if(config == NULL || config_load(config, name) != 0) if(config == NULL || config_load(config, name) != 0)
{ {
menu->helper->error(NULL, error_get(), 1); menu->helper->error(NULL, error_get(NULL), 1);
continue; continue;
} }
/* skip this entry if it is deleted */ /* skip this entry if it is deleted */

4
src/applets/mixer.c
View File

@ -400,13 +400,13 @@ static int _mixer_spawn(Mixer * mixer, unsigned long * xid)
if((size = read(out, buf, sizeof(buf) - 1)) <= 0) /* XXX may block */ if((size = read(out, buf, sizeof(buf) - 1)) <= 0) /* XXX may block */
{ {
error_set("%s: %s: %s", applet.name, "read", strerror(errno)); error_set("%s: %s: %s", applet.name, "read", strerror(errno));
return -helper->error(helper->panel, error_get(), 1); return -helper->error(helper->panel, error_get(NULL), 1);
} }
buf[size] = '\0'; buf[size] = '\0';
if(sscanf(buf, "%lu", xid) != 1) if(sscanf(buf, "%lu", xid) != 1)
{ {
error_set("%s: %s", applet.name, _("Could not start mixer")); error_set("%s: %s", applet.name, _("Could not start mixer"));
return -helper->error(helper->panel, error_get(), 1); return -helper->error(helper->panel, error_get(NULL), 1);
} }
return 0; return 0;
} }

5
src/applets/network.c
View File

@ -134,7 +134,7 @@ static Network * _network_init(PanelAppletHelper * helper, GtkWidget ** widget)
if((network->fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) if((network->fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
{ {
error_set("%s: %s: %s", applet.name, "socket", strerror(errno)); error_set("%s: %s: %s", applet.name, "socket", strerror(errno));
network->helper->error(NULL, error_get(), 1); network->helper->error(NULL, error_get(NULL), 1);
} }
network->interfaces = NULL; network->interfaces = NULL;
network->interfaces_cnt = 0; network->interfaces_cnt = 0;
@ -227,7 +227,8 @@ static void _refresh_interface(Network * network, char const * name,
if((res = _refresh_interface_add(network, name, flags)) != 0) if((res = _refresh_interface_add(network, name, flags)) != 0)
{ {
if(res < 0) if(res < 0)
network->helper->error(NULL, error_get(), 1); network->helper->error(NULL, error_get(NULL),
1);
return; return;
} }
_refresh_interface_flags(network, &network->interfaces[i], flags); _refresh_interface_flags(network, &network->interfaces[i], flags);

2
src/applets/usb.c
View File

@ -181,7 +181,7 @@ static gboolean _usb_on_timeout(gpointer data)
if(_usb_get(usb, &active) == FALSE) if(_usb_get(usb, &active) == FALSE)
{ {
usb->helper->error(NULL, error_get(), 1); usb->helper->error(NULL, error_get(NULL), 1);
_usb_set(usb, FALSE); _usb_set(usb, FALSE);
usb->timeout = 0; usb->timeout = 0;
return FALSE; return FALSE;

18
src/applets/volume.c
View File

@ -201,7 +201,7 @@ static Volume * _volume_new(PanelAppletHelper * helper)
{ {
error_set("%s: %s: %s", applet.name, volume->device, error_set("%s: %s: %s", applet.name, volume->device,
strerror(errno)); strerror(errno));
helper->error(NULL, error_get(), 1); helper->error(NULL, error_get(NULL), 1);
return volume; return volume;
} }
for(i = 0; volume->outputs == -1 || volume->mix == -1; i++) for(i = 0; volume->outputs == -1 || volume->mix == -1; i++)
@ -252,7 +252,7 @@ static Volume * _volume_new(PanelAppletHelper * helper)
{ {
error_set("%s: %s: %s", applet.name, volume->device, error_set("%s: %s: %s", applet.name, volume->device,
strerror(errno)); strerror(errno));
helper->error(NULL, error_get(), 1); helper->error(NULL, error_get(NULL), 1);
} }
else else
volume->source = g_timeout_add(timeout, volume->source = g_timeout_add(timeout,
@ -272,7 +272,7 @@ static void _volume_delete(Volume * volume)
{ {
error_set("%s: %s: %s", applet.name, volume->device, error_set("%s: %s: %s", applet.name, volume->device,
strerror(errno)); strerror(errno));
volume->helper->error(NULL, error_get(), 1); volume->helper->error(NULL, error_get(NULL), 1);
} }
#elif defined(SND_LIB_MAJOR) #elif defined(SND_LIB_MAJOR)
if(volume->mixer != NULL) if(volume->mixer != NULL)
@ -282,7 +282,7 @@ static void _volume_delete(Volume * volume)
{ {
error_set("%s: %s: %s", applet.name, volume->device, error_set("%s: %s: %s", applet.name, volume->device,
strerror(errno)); strerror(errno));
volume->helper->error(NULL, error_get(), 1); volume->helper->error(NULL, error_get(NULL), 1);
} }
#endif #endif
free(volume); free(volume);
@ -311,7 +311,7 @@ static gdouble _volume_get(Volume * volume)
{ {
error_set("%s: %s: %s", applet.name, error_set("%s: %s: %s", applet.name,
"AUDIO_MIXER_DEVINFO", strerror(errno)); "AUDIO_MIXER_DEVINFO", strerror(errno));
helper->error(NULL, error_get(), 1); helper->error(NULL, error_get(NULL), 1);
close(volume->fd); close(volume->fd);
volume->fd = -1; volume->fd = -1;
break; break;
@ -325,7 +325,7 @@ static gdouble _volume_get(Volume * volume)
{ {
error_set("%s: %s: %s", applet.name, "AUDIO_MIXER_READ", error_set("%s: %s: %s", applet.name, "AUDIO_MIXER_READ",
strerror(errno)); strerror(errno));
helper->error(NULL, error_get(), 1); helper->error(NULL, error_get(NULL), 1);
} }
else else
ret = mc.un.value.level[0] / 255.0; ret = mc.un.value.level[0] / 255.0;
@ -350,7 +350,7 @@ static gdouble _volume_get(Volume * volume)
{ {
error_set("%s: %s: %s", applet.name, "MIXER_READ", error_set("%s: %s: %s", applet.name, "MIXER_READ",
strerror(errno)); strerror(errno));
helper->error(NULL, error_get(), 1); helper->error(NULL, error_get(NULL), 1);
close(volume->fd); close(volume->fd);
volume->fd = -1; volume->fd = -1;
} }
@ -400,7 +400,7 @@ int _volume_set(Volume * volume, gdouble value)
{ {
error_set("%s: %s: %s", applet.name, error_set("%s: %s: %s", applet.name,
"AUDIO_MIXER_WRITE", strerror(errno)); "AUDIO_MIXER_WRITE", strerror(errno));
ret |= helper->error(NULL, error_get(), 1); ret |= helper->error(NULL, error_get(NULL), 1);
} }
break; break;
} }
@ -423,7 +423,7 @@ int _volume_set(Volume * volume, gdouble value)
{ {
error_set("%s: %s: %s", applet.name, "MIXER_WRITE", error_set("%s: %s: %s", applet.name, "MIXER_WRITE",
strerror(errno)); strerror(errno));
ret |= helper->error(NULL, error_get(), 1); ret |= helper->error(NULL, error_get(NULL), 1);
} }
#endif #endif
return ret; return ret;

2
src/applets/wpa_supplicant.c
View File

@ -491,7 +491,7 @@ static int _wpa_error(WPA * wpa, char const * message, int ret)
{ {
error_set("%s: %s", applet.name, message); error_set("%s: %s", applet.name, message);
_wpa_set_status(wpa, FALSE, FALSE, NULL); _wpa_set_status(wpa, FALSE, FALSE, NULL);
return wpa->helper->error(NULL, error_get(), ret); return wpa->helper->error(NULL, error_get(NULL), ret);
} }

2
src/panel.c
View File

@ -407,7 +407,7 @@ int panel_error(Panel * panel, char const * message, int ret)
"%s", _("Error")); "%s", _("Error"));
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
#endif #endif
"%s", (message != NULL) ? message : error_get()); "%s", (message != NULL) ? message : error_get(NULL));
gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER); gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
gtk_window_set_title(GTK_WINDOW(dialog), _("Error")); gtk_window_set_title(GTK_WINDOW(dialog), _("Error"));
g_signal_connect(dialog, "delete-event", G_CALLBACK(_error_on_closex), g_signal_connect(dialog, "delete-event", G_CALLBACK(_error_on_closex),

2
src/run.c
View File

@ -515,7 +515,7 @@ int main(int argc, char * argv[])
if(optind != argc) if(optind != argc)
return _usage(); return _usage();
if((run = _run_new()) == NULL) if((run = _run_new()) == NULL)
return _run_error(NULL, error_get(), 2); return _run_error(NULL, error_get(NULL), 2);
gtk_main(); gtk_main();
_run_delete(run); _run_delete(run);
return 0; return 0;

2
tools/helper.c
View File

@ -112,7 +112,7 @@ char const * panel_get_config(Panel * panel, char const * section,
int panel_error(Panel * panel, char const * message, int ret) int panel_error(Panel * panel, char const * message, int ret)
{ {
fprintf(stderr, "%s: %s\n", PROGNAME, (message != NULL) ? message fprintf(stderr, "%s: %s\n", PROGNAME, (message != NULL) ? message
: error_get()); : error_get(NULL));
return ret; return ret;
} }

12
tools/settings.c
View File

@ -265,7 +265,7 @@ static int _settings_browse(Settings * settings)
int datadir = 1; int datadir = 1;
if((config = config_new()) == NULL) if((config = config_new()) == NULL)
return -_settings_error(error_get(), 1); return -_settings_error(error_get(NULL), 1);
model = _settings_get_model(settings); model = _settings_get_model(settings);
gtk_list_store_clear(GTK_LIST_STORE(model)); gtk_list_store_clear(GTK_LIST_STORE(model));
/* read through every XDG application folder */ /* read through every XDG application folder */
@ -275,7 +275,7 @@ static int _settings_browse(Settings * settings)
datadir = 0; datadir = 0;
} }
if((p = strdup(path)) == NULL) if((p = strdup(path)) == NULL)
_settings_error(error_get(), 1); _settings_error(error_get(NULL), 1);
else else
for(i = 0, j = 0;; i++) for(i = 0, j = 0;; i++)
if(p[i] == '\0') if(p[i] == '\0')
@ -331,7 +331,7 @@ static int _settings_browse_folder(Settings * settings, Config * config,
fprintf(stderr, "DEBUG: %s(\"%s\")\n", __func__, folder); fprintf(stderr, "DEBUG: %s(\"%s\")\n", __func__, folder);
#endif #endif
if((path = string_new_append(folder, "/applications", NULL)) == NULL) if((path = string_new_append(folder, "/applications", NULL)) == NULL)
return -_settings_error(error_get(), 1); return -_settings_error(error_get(NULL), 1);
dir = opendir(path); dir = opendir(path);
string_delete(path); string_delete(path);
if(dir == NULL) if(dir == NULL)
@ -349,7 +349,7 @@ static int _settings_browse_folder(Settings * settings, Config * config,
if((path = string_new_append(folder, "/applications/", if((path = string_new_append(folder, "/applications/",
de->d_name, NULL)) == NULL) de->d_name, NULL)) == NULL)
{ {
_settings_error(error_get(), 1); _settings_error(error_get(NULL), 1);
continue; continue;
} }
#ifdef DEBUG #ifdef DEBUG
@ -360,7 +360,7 @@ static int _settings_browse_folder(Settings * settings, Config * config,
string_delete(path); string_delete(path);
if(res != 0) if(res != 0)
{ {
_settings_error(error_get(), 1); _settings_error(error_get(NULL), 1);
continue; continue;
} }
p = config_get(config, section, "Type"); p = config_get(config, section, "Type");
@ -474,7 +474,7 @@ static int _settings_browse_home(Settings * settings, Config * config)
if((homedir = getenv("HOME")) == NULL) if((homedir = getenv("HOME")) == NULL)
homedir = g_get_home_dir(); homedir = g_get_home_dir();
if((p = string_new_append(homedir, "/", fallback, NULL)) == NULL) if((p = string_new_append(homedir, "/", fallback, NULL)) == NULL)
return -_settings_error(error_get(), 1); return -_settings_error(error_get(NULL), 1);
ret = _settings_browse_folder(settings, config, p); ret = _settings_browse_folder(settings, config, p);
free(p); free(p);
return ret; return ret;