[sysprof] Move from SpScrolledWindow to GtkScrolledWindow
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [sysprof] Move from SpScrolledWindow to GtkScrolledWindow
- Date: Fri, 10 Jun 2016 19:33:23 +0000 (UTC)
commit 15a2873c2556f7f78057886044837944e14fd365
Author: Timm Bäder <mail baedert org>
Date: Fri Jun 10 21:12:06 2016 +0200
Move from SpScrolledWindow to GtkScrolledWindow
GtkScrolledWindow has max-content-{width,height} properties now. Remove
SpScrolledWindow and bump the gtk+ requirement to 3.21.3 at the same
time.
configure.ac | 2 +-
lib/Makefile.am | 2 -
lib/resources/ui/sp-profiler-menu-button.ui | 4 +-
lib/sp-scrolled-window.c | 280 ---------------------------
lib/sp-scrolled-window.h | 45 -----
lib/sysprof-ui.h | 1 -
6 files changed, 3 insertions(+), 331 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8559597..dc52d93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -94,7 +94,7 @@ dnl ***********************************************************************
dnl Check for required packages
dnl ***********************************************************************
m4_define([glib_required_version], [2.44.0])
-m4_define([gtk_required_version], [3.16.0])
+m4_define([gtk_required_version], [3.21.3])
m4_define([systemd_required_version], [222])
PKG_CHECK_MODULES(GIO,
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 3e67fd1..d69694e 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -140,7 +140,6 @@ uiheaders_DATA = \
sp-process-model-row.h \
sp-profiler-menu-button.h \
sp-recording-state-view.h \
- sp-scrolled-window.h \
sysprof-ui.h \
$(NULL)
@@ -156,7 +155,6 @@ libsysprof_ui_ API_VERSION@_la_SOURCES = \
sp-process-model-row.c \
sp-profiler-menu-button.c \
sp-recording-state-view.c \
- sp-scrolled-window.c \
$(NULL)
libsysprof_ui_ API_VERSION@_la_CFLAGS = \
diff --git a/lib/resources/ui/sp-profiler-menu-button.ui b/lib/resources/ui/sp-profiler-menu-button.ui
index 8af0fad..93a2b7a 100644
--- a/lib/resources/ui/sp-profiler-menu-button.ui
+++ b/lib/resources/ui/sp-profiler-menu-button.ui
@@ -95,7 +95,7 @@
</object>
</child>
<child>
- <object class="SpScrolledWindow">
+ <object class="GtkScrolledWindow">
<property name="expand">true</property>
<property name="min-content-width">100</property>
<property name="max-content-width">400</property>
@@ -162,7 +162,7 @@
</object>
</child>
<child>
- <object class="SpScrolledWindow">
+ <object class="GtkScrolledWindow">
<property name="shadow-type">in</property>
<property name="min-content-height">100</property>
<property name="max-content-height">400</property>
diff --git a/lib/sysprof-ui.h b/lib/sysprof-ui.h
index 6212ece..d215241 100644
--- a/lib/sysprof-ui.h
+++ b/lib/sysprof-ui.h
@@ -33,7 +33,6 @@ G_BEGIN_DECLS
# include "sp-process-model-item.h"
# include "sp-process-model-row.h"
# include "sp-profiler-menu-button.h"
-# include "sp-scrolled-window.h"
#undef SYSPROF_INSIDE
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]