main: Fix constness mismatches
This commit is contained in:
parent
9aa98d9f0c
commit
6c43d0247a
@ -54,7 +54,7 @@ static void
|
|||||||
shell_dbus_acquire_name (GDBusProxy *bus,
|
shell_dbus_acquire_name (GDBusProxy *bus,
|
||||||
guint32 request_name_flags,
|
guint32 request_name_flags,
|
||||||
guint32 *request_name_result,
|
guint32 *request_name_result,
|
||||||
gchar *name,
|
const gchar *name,
|
||||||
gboolean fatal)
|
gboolean fatal)
|
||||||
{
|
{
|
||||||
GError *error = NULL;
|
GError *error = NULL;
|
||||||
@ -79,13 +79,13 @@ shell_dbus_acquire_name (GDBusProxy *bus,
|
|||||||
static void
|
static void
|
||||||
shell_dbus_acquire_names (GDBusProxy *bus,
|
shell_dbus_acquire_names (GDBusProxy *bus,
|
||||||
guint32 request_name_flags,
|
guint32 request_name_flags,
|
||||||
gchar *name,
|
const gchar *name,
|
||||||
gboolean fatal, ...) G_GNUC_NULL_TERMINATED;
|
gboolean fatal, ...) G_GNUC_NULL_TERMINATED;
|
||||||
|
|
||||||
static void
|
static void
|
||||||
shell_dbus_acquire_names (GDBusProxy *bus,
|
shell_dbus_acquire_names (GDBusProxy *bus,
|
||||||
guint32 request_name_flags,
|
guint32 request_name_flags,
|
||||||
gchar *name,
|
const gchar *name,
|
||||||
gboolean fatal, ...)
|
gboolean fatal, ...)
|
||||||
{
|
{
|
||||||
va_list al;
|
va_list al;
|
||||||
@ -454,7 +454,7 @@ main (int argc, char **argv)
|
|||||||
|
|
||||||
/* Initialize the global object */
|
/* Initialize the global object */
|
||||||
if (session_mode == NULL)
|
if (session_mode == NULL)
|
||||||
session_mode = is_gdm_mode ? "gdm" : "user";
|
session_mode = is_gdm_mode ? (char *)"gdm" : (char *)"user";
|
||||||
|
|
||||||
_shell_global_init ("session-mode", session_mode, NULL);
|
_shell_global_init ("session-mode", session_mode, NULL);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user