[gnome-applets/wip/muktupavels/werror] window-title: fix -Wsign-compare warning
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-applets/wip/muktupavels/werror] window-title: fix -Wsign-compare warning
- Date: Sat, 4 Apr 2020 15:46:59 +0000 (UTC)
commit d82ab9f4e9d439d2c80d2e233aa99a7900dc1072
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Sat Apr 4 18:45:34 2020 +0300
window-title: fix -Wsign-compare warning
gnome-applets/window-title/window-title-private.h | 1 -
gnome-applets/window-title/window-title.c | 10 ++++++----
2 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/gnome-applets/window-title/window-title-private.h
b/gnome-applets/window-title/window-title-private.h
index 6bc77ee23..4e7885b7b 100755
--- a/gnome-applets/window-title/window-title-private.h
+++ b/gnome-applets/window-title/window-title-private.h
@@ -110,7 +110,6 @@ struct _WTApplet
GtkPositionType position; // Panel orientation
gint asize; // Applet allocation size
gint *size_hints; // Applet size hints
- GtkPackType packtype; // Packaging direction of buttons
/* GtkBuilder */
GtkBuilder *prefbuilder; // Glade GtkBuilder for the preferences
diff --git a/gnome-applets/window-title/window-title.c b/gnome-applets/window-title/window-title.c
index 654875ece..6d7d34213 100755
--- a/gnome-applets/window-title/window-title.c
+++ b/gnome-applets/window-title/window-title.c
@@ -611,6 +611,8 @@ title_clicked (GtkWidget *title,
static void
placeWidgets (WTApplet *wtapplet)
{
+ gboolean swap_order;
+
// TODO: merge all this... or not?
if (wtapplet->position == GTK_POS_LEFT) {
wtapplet->angle = GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE;
@@ -620,10 +622,10 @@ placeWidgets (WTApplet *wtapplet)
wtapplet->angle = GDK_PIXBUF_ROTATE_NONE;
}
+ swap_order = wtapplet->prefs->swap_order;
+
if (wtapplet->angle == GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE) {
- wtapplet->packtype = GTK_PACK_END;
- } else {
- wtapplet->packtype = GTK_PACK_START;
+ swap_order = !swap_order;
}
// set box orientation
@@ -634,7 +636,7 @@ placeWidgets (WTApplet *wtapplet)
}
// set packing order
- if (wtapplet->prefs->swap_order == wtapplet->packtype) {
+ if (!swap_order) {
gtk_box_pack_start(wtapplet->box, GTK_WIDGET(wtapplet->eb_icon), FALSE, TRUE, 0);
gtk_box_pack_start(wtapplet->box, GTK_WIDGET(wtapplet->eb_title), TRUE, TRUE, 0);
} else {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]