gtk4/gtk4-return-nonvoid.patch
Dominique Leuenberger c347416251 Accepting request 538597 from GNOME:Next
- Update to version 3.92.1:
  + Drop autotools support. Meson 0.42.1 is now required
  + Implement most of CSS3 font-variant
  + Add an Emoji chooser to GtkEntry
  + Add new input hints for Emoji input
  + Remaining widgets have been ported to GtkSnapshot
  + GtkLabel and GtkEntry have been ported to use GSK
  + Add a way for GtkOverlay to blur behind children. This is has a
    demo in gtk4-demo
  + Add support for native file choosers on older OS X versions
  + Add support for libcloudproviders in GtkPlacesSidebar
  + Non-windowed widgets are now allowed to have a size of 0x0
  + Allow tiled windows to be resized. Under wayland, this uses
    version 2 of the gtk-shell protocol. Under X, it uses the
    _GTK_EDGE_CONSTRAINTS property
  + Input handling changes
    - GdkEvent has new accessors for fields
    - Traditional event signals (eg ::key-press-event) are now emitted from
      an event controller
    - Most widgets inside gtk have stopped using traditional event signals
    - GDK_SEAT_CAPABILITY_ALL_POINTING now includes touch events
  + Scrollbars allow middle-click to jump to a position again
  + Bugs fixed: bgo#639931, bgo#644248, bgo#701296, bgo#705640,
    bgo#728452, bgo#763517, bgo#766909, bgo#773299, bgo#775074,
    bgo#775126, bgo#778382, bgo#778811, bgo#780750, bgo#780758,
    bgo#781757, bgo#782981, bgo#783649, bgo#783669, bgo#784016,
    bgo#784421, bgo#785210, bgo#785306, bgo#785736, bgo#786144,
    bgo#786209, bgo#786400, bgo#786469, bgo#786485, bgo#786492,
    bgo#786553, bgo#786613, bgo#786673, bgo#786794, bgo#786885,
    bgo#786931, bgo#786932, bgo#786938, bgo#786940, bgo#786956,

OBS-URL: https://build.opensuse.org/request/show/538597
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk4?expand=0&rev=23
2017-11-07 09:41:31 +00:00

157 lines
5.0 KiB
Diff

commit 8549e62d8595bb6f94b51f2051f8542e357f236b
Author: Benjamin Otte <otte@redhat.com>
Date: Tue Oct 24 18:13:45 2017 +0200
Add default return values to switch statements
We are using g_assert_not_reached() without doing anything, assuming it
aborts the program. In release builds however, it is ignored.
diff --git a/gdk/x11/gdkdevicemanager-core-x11.c b/gdk/x11/gdkdevicemanager-core-x11.c
index 350a79b03f..dd8613e3fd 100644
--- a/gdk/x11/gdkdevicemanager-core-x11.c
+++ b/gdk/x11/gdkdevicemanager-core-x11.c
@@ -265,6 +265,7 @@ translate_crossing_mode (int mode)
return GDK_CROSSING_UNGRAB;
default:
g_assert_not_reached ();
+ return GDK_CROSSING_NORMAL;
}
}
@@ -285,6 +286,7 @@ translate_notify_type (int detail)
return GDK_NOTIFY_NONLINEAR_VIRTUAL;
default:
g_assert_not_reached ();
+ return GDK_NOTIFY_UNKONWN;
}
}
diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
index 8779c65a72..758513e4db 100644
--- a/gdk/x11/gdkdevicemanager-xi2.c
+++ b/gdk/x11/gdkdevicemanager-xi2.c
@@ -1068,6 +1068,7 @@ translate_crossing_mode (gint mode)
/* Fall through, unexpected in pointer crossing events */
default:
g_assert_not_reached ();
+ return GDK_CROSSING_NORMAL;
}
}
@@ -1088,6 +1089,7 @@ translate_notify_type (gint detail)
return GDK_NOTIFY_NONLINEAR_VIRTUAL;
default:
g_assert_not_reached ();
+ return GDK_NOTIFY_UNKONWN;
}
}
diff --git a/gtk/gtkcssselector.c b/gtk/gtkcssselector.c
index 241a690230..961e78ea5c 100644
--- a/gtk/gtkcssselector.c
+++ b/gtk/gtkcssselector.c
@@ -876,6 +876,7 @@ change_pseudoclass_position (const GtkCssSelector *selector)
return GTK_CSS_CHANGE_FIRST_CHILD | GTK_CSS_CHANGE_LAST_CHILD;
default:
g_assert_not_reached ();
+ return 0;
}
}
diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c
index 2e7e21207b..62404a05c6 100644
--- a/gtk/inspector/general.c
+++ b/gtk/inspector/general.c
@@ -501,7 +501,7 @@ translate_subpixel_layout (GdkSubpixelLayout subpixel)
case GDK_SUBPIXEL_LAYOUT_HORIZONTAL_BGR: return "horizontal bgr";
case GDK_SUBPIXEL_LAYOUT_VERTICAL_RGB: return "vertical rgb";
case GDK_SUBPIXEL_LAYOUT_VERTICAL_BGR: return "vertical bgr";
- default: g_assert_not_reached ();
+ default: g_assert_not_reached (); return "none;
}
}
commit 46f475664d66e25f0cc4212786c441f929a91d05
Author: Emmanuele Bassi <ebassi@gnome.org>
Date: Tue Oct 24 16:58:06 2017 +0100
Add a return value
When building with G_DISABLE_ASSERT, the g_assert_not_reached()
statement won't do anything, and we're going to fall through, and the
compiler will emit a warning that we're not returning anything from a
function with a return value.
diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
index bb15eb1820..2d738a63ca 100644
--- a/gdk/wayland/gdkwindow-wayland.c
+++ b/gdk/wayland/gdkwindow-wayland.c
@@ -1617,6 +1617,9 @@ rect_anchor_to_anchor (GdkGravity rect_anchor)
default:
g_assert_not_reached ();
}
+
+ return (ZXDG_POSITIONER_V6_ANCHOR_TOP |
+ ZXDG_POSITIONER_V6_ANCHOR_LEFT);
}
static enum zxdg_positioner_v6_gravity
@@ -1650,6 +1653,9 @@ window_anchor_to_gravity (GdkGravity rect_anchor)
default:
g_assert_not_reached ();
}
+
+ return (ZXDG_POSITIONER_V6_GRAVITY_BOTTOM |
+ ZXDG_POSITIONER_V6_GRAVITY_RIGHT);
}
static GdkWindow *
commit 373b407bd26a940072173e0a509038185b63e936
Author: Benjamin Otte <otte@redhat.com>
Date: Tue Oct 24 18:26:08 2017 +0200
Fix build
Don't do two things at once and forget to run ninja before pushing.
diff --git a/gdk/x11/gdkdevicemanager-core-x11.c b/gdk/x11/gdkdevicemanager-core-x11.c
index dd8613e3fd..c662d215ce 100644
--- a/gdk/x11/gdkdevicemanager-core-x11.c
+++ b/gdk/x11/gdkdevicemanager-core-x11.c
@@ -286,7 +286,7 @@ translate_notify_type (int detail)
return GDK_NOTIFY_NONLINEAR_VIRTUAL;
default:
g_assert_not_reached ();
- return GDK_NOTIFY_UNKONWN;
+ return GDK_NOTIFY_UNKNOWN;
}
}
diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
index 758513e4db..56fb2c8b25 100644
--- a/gdk/x11/gdkdevicemanager-xi2.c
+++ b/gdk/x11/gdkdevicemanager-xi2.c
@@ -1089,7 +1089,7 @@ translate_notify_type (gint detail)
return GDK_NOTIFY_NONLINEAR_VIRTUAL;
default:
g_assert_not_reached ();
- return GDK_NOTIFY_UNKONWN;
+ return GDK_NOTIFY_UNKNOWN;
}
}
diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c
index 62404a05c6..45a386e56b 100644
--- a/gtk/inspector/general.c
+++ b/gtk/inspector/general.c
@@ -501,7 +501,7 @@ translate_subpixel_layout (GdkSubpixelLayout subpixel)
case GDK_SUBPIXEL_LAYOUT_HORIZONTAL_BGR: return "horizontal bgr";
case GDK_SUBPIXEL_LAYOUT_VERTICAL_RGB: return "vertical rgb";
case GDK_SUBPIXEL_LAYOUT_VERTICAL_BGR: return "vertical bgr";
- default: g_assert_not_reached (); return "none;
+ default: g_assert_not_reached (); return "none";
}
}