summaryrefslogtreecommitdiff
path: root/src/core/util.c
diff options
context:
space:
mode:
authorrbuj <[email protected]>2020-08-04 10:39:44 +0200
committerraveit65 <[email protected]>2020-08-04 16:39:25 +0200
commit85a22e754cd1f43e178e4a81c182643d4319bc5b (patch)
treeec52f20880ba991d7abcc863de2a9c302ddf2d41 /src/core/util.c
parent29f0d1d7ddd859433bf953fba3861a4746b3f09a (diff)
downloadmarco-85a22e754cd1f43e178e4a81c182643d4319bc5b.tar.bz2
marco-85a22e754cd1f43e178e4a81c182643d4319bc5b.tar.xz
Remove trailing spaces/tabs
find . \( -name '*.h' -o -name '*.c' \) -exec sed -i 's/[[:space:]]*$//' {} \; find . \( -name '*.h' -o -name '*.c' \) -exec sed -i 's/\t*$//' {} \;
Diffstat (limited to 'src/core/util.c')
-rw-r--r--src/core/util.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/core/util.c b/src/core/util.c
index 6ebaf3c9..9e15bb26 100644
--- a/src/core/util.c
+++ b/src/core/util.c
@@ -640,13 +640,13 @@ meta_show_entry_dialog(const char *message,
meta_topic (META_DEBUG_KEYBINDINGS,
"meta_show_entry_dialog: called. active_workspace_id=%d message=%s entry_text=%s\n",
*active_workspace_id, message, entry_text);
-
+
GError *error = NULL;
int i = 0;
GPid child_pid;
gint stdout_fd;
const char **argvl = g_malloc (sizeof (char *) * (17));
-
+
argvl[i++] = "zenity";
argvl[i++] = "--entry";
argvl[i++] = "--display";
@@ -658,27 +658,27 @@ meta_show_entry_dialog(const char *message,
argvl[i++] = _ ("Marco");
argvl[i++] = "--text";
argvl[i++] = message;
-
+
if (entry_text)
{
argvl[i++] = "--entry-text";
argvl[i++] = entry_text;
}
-
+
if (ok_text)
{
argvl[i++] = "--ok-label";
argvl[i++] = ok_text;
}
-
+
if (cancel_text)
{
argvl[i++] = "--cancel-label";
argvl[i++] = cancel_text;
}
argvl[i] = NULL;
-
-
+
+
unsetenv ("WINDOWID"); /* start in current workspace */
g_spawn_async_with_pipes (
"/",
@@ -693,9 +693,9 @@ meta_show_entry_dialog(const char *message,
NULL,
&error
);
-
+
g_free (argvl);
-
+
if (error)
{
meta_warning ("%s\n", error->message);
@@ -711,7 +711,7 @@ meta_show_entry_dialog(const char *message,
g_io_add_watch(ioc, G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_HUP | G_IO_NVAL, stdio_func_cb, active_workspace_id);
g_io_channel_unref(ioc);
}
-
+
return child_pid;
}
/* eof util.c */