Commit 9fb0bcaf authored by Alberts Muktupāvels's avatar Alberts Muktupāvels

shell: rename ShowMonitorLabels2 to ShowMonitorLabels

gnome-shell@2c8d380e
gnome-control-center@3721f9ed
parent cc0d926a
Pipeline #95462 passed with stage
in 11 minutes and 58 seconds
/*
* Copyright (C) 2015 Alberts Muktupāvels
* Copyright (C) 2015-2019 Alberts Muktupāvels
*
* 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
......@@ -178,10 +178,10 @@ flashback_monitor_labeler_new (void)
}
void
flashback_monitor_labeler_show2 (FlashbackMonitorLabeler *labeler,
GfMonitorManager *monitor_manager,
const gchar *sender,
GVariant *params)
flashback_monitor_labeler_show (FlashbackMonitorLabeler *labeler,
GfMonitorManager *monitor_manager,
const gchar *sender,
GVariant *params)
{
GVariantIter iter;
const gchar *connector;
......
/*
* Copyright (C) 2015 Alberts Muktupāvels
* Copyright (C) 2015-2019 Alberts Muktupāvels
*
* 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
......@@ -26,15 +26,15 @@ G_BEGIN_DECLS
G_DECLARE_FINAL_TYPE (FlashbackMonitorLabeler, flashback_monitor_labeler,
FLASHBACK, MONITOR_LABELER, GObject)
FlashbackMonitorLabeler *flashback_monitor_labeler_new (void);
FlashbackMonitorLabeler *flashback_monitor_labeler_new (void);
void flashback_monitor_labeler_show2 (FlashbackMonitorLabeler *labeler,
GfMonitorManager *monitor_manager,
const gchar *sender,
GVariant *params);
void flashback_monitor_labeler_show (FlashbackMonitorLabeler *labeler,
GfMonitorManager *monitor_manager,
const gchar *sender,
GVariant *params);
void flashback_monitor_labeler_hide (FlashbackMonitorLabeler *labeler,
const gchar *sender);
void flashback_monitor_labeler_hide (FlashbackMonitorLabeler *labeler,
const gchar *sender);
G_END_DECLS
......
/*
* Copyright (C) 2015 Alberts Muktupāvels
* Copyright (C) 2015-2019 Alberts Muktupāvels
*
* 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
......@@ -245,10 +245,10 @@ handle_show_osd (FlashbackDBusShell *dbus_shell,
}
static gboolean
handle_show_monitor_labels2 (FlashbackDBusShell *dbus_shell,
GDBusMethodInvocation *invocation,
GVariant *params,
gpointer user_data)
handle_show_monitor_labels (FlashbackDBusShell *dbus_shell,
GDBusMethodInvocation *invocation,
GVariant *params,
gpointer user_data)
{
FlashbackShell *shell;
const gchar *sender;
......@@ -258,10 +258,10 @@ handle_show_monitor_labels2 (FlashbackDBusShell *dbus_shell,
g_assert (shell->monitor_manager != NULL);
flashback_monitor_labeler_show2 (shell->labeler, shell->monitor_manager,
sender, params);
flashback_monitor_labeler_show (shell->labeler, shell->monitor_manager,
sender, params);
flashback_dbus_shell_complete_show_monitor_labels2 (dbus_shell, invocation);
flashback_dbus_shell_complete_show_monitor_labels (dbus_shell, invocation);
return TRUE;
}
......@@ -441,8 +441,8 @@ name_appeared_handler (GDBusConnection *connection,
G_CALLBACK (handle_focus_search), shell);
g_signal_connect (skeleton, "handle-show-osd",
G_CALLBACK (handle_show_osd), shell);
g_signal_connect (skeleton, "handle-show-monitor-labels2",
G_CALLBACK (handle_show_monitor_labels2), shell);
g_signal_connect (skeleton, "handle-show-monitor-labels",
G_CALLBACK (handle_show_monitor_labels), shell);
g_signal_connect (skeleton, "handle-hide-monitor-labels",
G_CALLBACK (handle_hide_monitor_labels), shell);
g_signal_connect (skeleton, "handle-focus-app",
......
......@@ -10,7 +10,7 @@
<method name="ShowOSD">
<arg type="a{sv}" direction="in" name="params" />
</method>
<method name="ShowMonitorLabels2">
<method name="ShowMonitorLabels">
<arg type="a{sv}" direction="in" name="params" />
</method>
<method name="HideMonitorLabels" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment