summaryrefslogtreecommitdiff
path: root/applets/notification_area/system-tray
diff options
context:
space:
mode:
authorZenWalker <[email protected]>2017-07-16 04:18:38 +0200
committerlukefromdc <[email protected]>2017-07-16 20:55:54 -0400
commit7bee2f870bcf850f68fdf8d8db4bd2e914ece143 (patch)
tree3eec98f92a396c40e0db2b1cfaf531489294492e /applets/notification_area/system-tray
parentcf46fb7f03d6ab0e106fa1cbfbf180fbbb9a5b75 (diff)
downloadmate-panel-7bee2f870bcf850f68fdf8d8db4bd2e914ece143.tar.bz2
mate-panel-7bee2f870bcf850f68fdf8d8db4bd2e914ece143.tar.xz
avoid deprecated gdk_screen_get_number
Diffstat (limited to 'applets/notification_area/system-tray')
-rw-r--r--applets/notification_area/system-tray/na-tray-manager.c4
-rw-r--r--applets/notification_area/system-tray/na-tray.c12
2 files changed, 8 insertions, 8 deletions
diff --git a/applets/notification_area/system-tray/na-tray-manager.c b/applets/notification_area/system-tray/na-tray-manager.c
index 94d3003d..3886a10d 100644
--- a/applets/notification_area/system-tray/na-tray-manager.c
+++ b/applets/notification_area/system-tray/na-tray-manager.c
@@ -780,7 +780,7 @@ na_tray_manager_manage_screen_x11 (NaTrayManager *manager,
GDK_PROPERTY_CHANGE_MASK | GDK_STRUCTURE_MASK);
selection_atom_name = g_strdup_printf ("_NET_SYSTEM_TRAY_S%d",
- gdk_screen_get_number (screen));
+ gdk_x11_screen_get_screen_number (screen));
manager->selection_atom = gdk_atom_intern (selection_atom_name, FALSE);
g_free (selection_atom_name);
@@ -886,7 +886,7 @@ na_tray_manager_check_running_screen_x11 (GdkScreen *screen)
display = gdk_screen_get_display (screen);
selection_atom_name = g_strdup_printf ("_NET_SYSTEM_TRAY_S%d",
- gdk_screen_get_number (screen));
+ gdk_x11_screen_get_screen_number (screen));
selection_atom = gdk_x11_get_xatom_by_name_for_display (display,
selection_atom_name);
g_free (selection_atom_name);
diff --git a/applets/notification_area/system-tray/na-tray.c b/applets/notification_area/system-tray/na-tray.c
index c2488ecf..94fe6911 100644
--- a/applets/notification_area/system-tray/na-tray.c
+++ b/applets/notification_area/system-tray/na-tray.c
@@ -13,7 +13,7 @@
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
+ *
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
@@ -103,7 +103,7 @@ get_tray (TraysScreen *trays_screen)
{
if (trays_screen->all_trays == NULL)
return NULL;
-
+
return trays_screen->all_trays->data;
}
@@ -282,7 +282,7 @@ message_sent (NaTrayManager *manager,
icontip = g_hash_table_lookup (trays_screen->tip_table, icon);
find_buffer.id = id;
- if (icontip &&
+ if (icontip &&
(icontip->id == id ||
g_slist_find_custom (icontip->buffer, &find_buffer,
icon_tip_buffer_compare) != NULL))
@@ -437,7 +437,7 @@ na_tray_constructor (GType type,
initialized = TRUE;
}
- screen_number = gdk_screen_get_number (priv->screen);
+ screen_number = gdk_x11_screen_get_screen_number (priv->screen);
if (trays_screens [screen_number].tray_manager == NULL)
{
@@ -477,7 +477,7 @@ na_tray_constructor (GType type,
g_object_unref (tray_manager);
}
}
-
+
priv->trays_screen = &trays_screens [screen_number];
trays_screens [screen_number].all_trays = g_slist_append (trays_screens [screen_number].all_trays,
tray);
@@ -711,7 +711,7 @@ idle_redraw_cb (NaTray *tray)
g_hash_table_foreach (priv->trays_screen->icon_table,
(GHFunc) na_tray_child_force_redraw, NULL);
-
+
priv->idle_redraw_id = 0;
return FALSE;