cookiez/pam-fprint-grosshack
1
0
Fork 0
mirror of https://gitlab.com/mishakmak/pam-fprint-grosshack.git synced 2026-04-09 04:13:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change g_errors to g_warnings

Browse Source 
So as to avoid aborts when D-Bus isn't available.

https://bugzilla.redhat.com/show_bug.cgi?id=549484
This commit is contained in:
Bastien Nocera
2010-08-17 15:34:20 +01:00
parent 7544102f2e
commit 7872479415
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main.c
View File

@ -324,7 +324,7 @@ int main(int argc, char **argv)
r = fp_init(); r = fp_init();
if (r < 0) { if (r < 0) {
g_error("fprint init failed with error %d\n", r); g_warning("fprint init failed with error %d\n", r);
return r; return r;
} }
@ -340,8 +340,10 @@ int main(int argc, char **argv)
/* Obtain a connection to the session bus */ /* Obtain a connection to the session bus */
fprintd_dbus_conn = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error); fprintd_dbus_conn = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
if (fprintd_dbus_conn == NULL) if (fprintd_dbus_conn == NULL) {
g_error("Failed to open connection to bus: %s", error->message); g_warning("Failed to open connection to bus: %s", error->message);
return 1;
}
/* create the one instance of the Manager object to be shared between /* create the one instance of the Manager object to be shared between
* all fprintd users */ * all fprintd users */
@ -351,12 +353,13 @@ int main(int argc, char **argv)
DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS); DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
if (!org_freedesktop_DBus_request_name(driver_proxy, FPRINT_SERVICE_NAME, if (!org_freedesktop_DBus_request_name(driver_proxy, FPRINT_SERVICE_NAME,
0, &request_name_ret, &error)) 0, &request_name_ret, &error)) {
g_error("Failed to get name: %s", error->message); g_warning("Failed to get name: %s", error->message);
return 1;
if (request_name_ret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) { if (request_name_ret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
g_error ("Got result code %u from requesting name", request_name_ret); g_warning ("Got result code %u from requesting name", request_name_ret);
exit(1); return 1;
} }
g_message("D-Bus service launched with name: %s", FPRINT_SERVICE_NAME); g_message("D-Bus service launched with name: %s", FPRINT_SERVICE_NAME);