Merge lp:~noskcaj/gnome-system-monitor/titlebar into lp:~ubuntu-desktop/gnome-system-monitor/ubuntu

[Jackson Doak]

Use traditional titlebars on !gnome. Also adds lintian overrides that were dropped when we synced somehow

[Sebastien Bacher (seb128)]

Thanks, that looks fine, you include lintian changes as well, those should either be documented in the changelog or moved out of this changeset

review: Needs Fixing

[Sebastien Bacher (seb128)]

Thanks, testing that version I found other issues, the bg is transparent which makes the application quite unusable under Unity... that should be fixed before accepting in it vivid as well

review: Needs Fixing

[Tim Lunn (darkxst)]

seb, what is transparent the header bar? I don't see that but I do see incorrect theming.

Adwaita now applies header_bar styling to the titlebar class as well [1], quite a few apps are thus setting the class on header bar widget to "titlebar" rather than "header_bar", this includes atleast cheese, baobab, gnome-contacts, g-s-m and gedit. I guess this change needs to be incorporated into the ubuntu themes.

[1] https://git.gnome.org/browse/gnome-themes-standard/commit/?id=35191720f7676bd8f2b142387b767397bb18354e

[lp:~noskcaj/gnome-system-monitor/titlebar]

66. By Jackson Doak on 2014-12-08

Add part 2 patch

67. By Jackson Doak on 2014-12-08

typoe fix

[Sebastien Bacher (seb128)]

the update has been done by somebody else

Unmerged revisions

67. By Jackson Doak on 2014-12-08

typoe fix

66. By Jackson Doak on 2014-12-08

Add part 2 patch

65. By Jackson Doak on 2014-12-03

Add traditional-titlebars.patch. Uses traditional titlebars
on !Gnome. Thanks Tim Lunn. LP: #1385560, #1261608

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-25 17:20:48 +0000
+++ debian/changelog	2014-12-08 18:52:07 +0000
@@ -1,3 +1,10 @@
+gnome-system-monitor (3.14.1-1ubuntu1) vivid; urgency=medium
+
+  * Add traditional-titlebar patches. Uses traditional titlebars
+    on !Gnome. Thanks Tim Lunn. LP: #1385560, #1261608
+
+ -- Jackson Doak <[e-mail]>  Wed, 03 Dec 2014 08:03:13 +1100
+
 gnome-system-monitor (3.14.1-1) unstable; urgency=medium
 
   [ Jackson Doak ]

=== modified file 'debian/control'
--- debian/control	2014-10-25 17:20:48 +0000
+++ debian/control	2014-12-08 18:52:07 +0000
@@ -5,7 +5,8 @@
 Source: gnome-system-monitor
 Section: gnome
 Priority: optional
-Maintainer: Debian GNOME Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: Andreas Henriksson <[e-mail]>, Laurent Bigonville <[e-mail]>
 Build-Depends: appdata-tools,
                cdbs,

=== modified file 'debian/control.in'
--- debian/control.in	2014-10-25 17:20:48 +0000
+++ debian/control.in	2014-12-08 18:52:07 +0000
@@ -1,7 +1,8 @@
 Source: gnome-system-monitor
 Section: gnome
 Priority: optional
-Maintainer: Debian GNOME Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian GNOME Maintainers <[e-mail]>
 Uploaders: @GNOME_TEAM@
 Build-Depends: appdata-tools,
                cdbs,

=== added directory 'debian/patches'
=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2014-12-08 18:52:07 +0000
@@ -0,0 +1,2 @@
+traditional-titlebars.patch
+traditional-titlebars-pt2.patch

=== added file 'debian/patches/traditional-titlebars-pt2.patch'
--- debian/patches/traditional-titlebars-pt2.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/traditional-titlebars-pt2.patch	2014-12-08 18:52:07 +0000
@@ -0,0 +1,25 @@
+From 44d0f8dedf7b533cb51d2aebbf71693bedcc6bb8 Mon Sep 17 00:00:00 2001
+From: Tim Lunn <[e-mail]>
+Date: Wed, 3 Dec 2014 07:42:51 +1100
+Subject: [PATCH] Don't set "titlebar" class when using headerbar widget as a
+ toolbar
+
+https://bugzilla.gnome.org/show_bug.cgi?id=741236
+---
+ src/interface.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/interface.cpp b/src/interface.cpp
+index b40676e..582bb80 100644
+--- a/src/interface.cpp
++++ b/src/interface.cpp
+@@ -646,6 +646,7 @@ create_main_window (GsmApplication *app)
+ 
+         mainbox = GTK_WIDGET (gtk_builder_get_object (builder, "main_box"));
+         headerbar = GTK_WIDGET (gtk_builder_get_object (builder, "header_bar"));
++        gtk_style_context_remove_class (gtk_widget_get_style_context (headerbar), "titlebar");
+         gtk_window_set_titlebar (GTK_WINDOW (main_window), NULL);
+         gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (headerbar), FALSE);
+         gtk_box_pack_start (GTK_BOX(mainbox), headerbar, FALSE, FALSE, 0);
+-- 
+2.1.3
\ No newline at end of file

=== added file 'debian/patches/traditional-titlebars.patch'
--- debian/patches/traditional-titlebars.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/traditional-titlebars.patch	2014-12-08 18:52:07 +0000
@@ -0,0 +1,40 @@
+From 059be700bade7088cfba4609b518d2e7c43b9a97 Mon Sep 17 00:00:00 2001
+From: Tim Lunn <[e-mail]>
+Date: Wed, 3 Dec 2014 07:42:51 +1100
+Subject: [PATCH] Use traditional titlebars on !GNOME DE's
+
+https://bugzilla.gnome.org/show_bug.cgi?id=741044
+---
+ src/interface.cpp |   14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+--- a/src/interface.cpp
++++ b/src/interface.cpp
+@@ -626,6 +626,8 @@ create_main_window (GsmApplication *app)
+     GtkWidget *process_menu_button;
+     GMenuModel *process_menu_model;
+ 
++    const char* session;
++
+     int width, height, xpos, ypos;
+ 
+     GtkBuilder *builder = gtk_builder_new();
+@@ -637,6 +639,18 @@ create_main_window (GsmApplication *app)
+     gtk_widget_set_name (main_window, "gnome-system-monitor");
+     app->main_window = main_window;
+ 
++    session = g_getenv ("XDG_CURRENT_DESKTOP");
++    if (session && !strstr (session, "GNOME")){
++        GtkWidget *mainbox;
++        GtkWidget *headerbar;
++
++        mainbox = GTK_WIDGET (gtk_builder_get_object (builder, "main_box"));
++        headerbar = GTK_WIDGET (gtk_builder_get_object (builder, "header_bar"));
++        gtk_window_set_titlebar (GTK_WINDOW (main_window), NULL);
++        gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (headerbar), FALSE);
++        gtk_box_pack_start (GTK_BOX(mainbox), headerbar, FALSE, FALSE, 0);
++    }
++
+     g_settings_get (app->settings, GSM_SETTING_WINDOW_STATE, "(iiii)",
+                     &width, &height, &xpos, &ypos);
+     width = CLAMP (width, 50, gdk_screen_width ());

=== added file 'debian/source/lintian-overrides'
--- debian/source/lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/source/lintian-overrides	2014-12-08 18:52:07 +0000
@@ -0,0 +1,3 @@
+# https://bugzilla.gnome.org/show_bug.cgi?id=738752
+gnome-system-monitor source: source-is-missing scripts/gsm-kill
+gnome-system-monitor source: source-is-missing scripts/gsm-renice