Unity

Merge lp:~bilalakhtar/unity/port-to-gtk3 into lp:unity

  1. port-to-gtk3
  2. Merge into trunk
Proposed by Bilal Akhtar
Status: Merged
Approved by: Gord Allott
Approved revision: no longer in the source branch.
Merged at revision: 1241
Proposed branch: lp:~bilalakhtar/unity/port-to-gtk3
Merge into: lp:unity
Diff against target: 69 lines (+6/-6)
4 files modified
CMakeLists.txt (+1/-1)
services/CMakeLists.txt (+1/-1)
src/PanelTray.cpp (+3/-3)
tools/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~bilalakhtar/unity/port-to-gtk3
Reviewer Review Type Date Requested Status
Gord Allott (community) Needs Fixing
Review via email: mp+61366@code.launchpad.net

Description of the change

This branch makes Unity work with GTK3. In my tests, there was no difference from the user's perspective after trying this build.

To post a comment you must log in.
Revision history for this message
Gord Allott (gordallott) wrote :

marking as needs fixing because it still draws in libindicator2 instead of libindicator3 (in the tests). also we shouldn't merge it until bamf is upgraded to use libwnck-3.0 instead of 1.0 - once those two things happen then we won't be drawing in gtk2 accidentally - otherwise should work well

review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2011-04-27 08:07:58 +0000
3+++ CMakeLists.txt 2011-05-18 09:36:31 +0000
4@@ -94,7 +94,7 @@
5 #
6 # src (Compiz Plugin)
7 #
8-set (UNITY_PLUGIN_DEPS "nux-0.9;libbamf;dee-1.0;gio-2.0;gio-unix-2.0;dbusmenu-glib-0.4;x11;libstartup-notification-1.0;gthread-2.0;indicator;atk;unity-misc;gconf-2.0;libutouch-geis")
9+set (UNITY_PLUGIN_DEPS "nux-0.9;libbamf;dee-1.0;gio-2.0;gio-unix-2.0;dbusmenu-glib-0.4;x11;libstartup-notification-1.0;gthread-2.0;indicator;atk;unity-misc;gconf-2.0;libutouch-geis;gtk+-3.0")
10
11 find_package (Compiz REQUIRED)
12 include (CompizPlugin)
13
14=== modified file 'services/CMakeLists.txt'
15--- services/CMakeLists.txt 2011-03-17 14:16:13 +0000
16+++ services/CMakeLists.txt 2011-05-18 09:36:31 +0000
17@@ -2,7 +2,7 @@
18 # Panel Service
19 #
20 find_package(PkgConfig)
21-pkg_check_modules(SERVICE_DEPS REQUIRED gobject-2.0 gio-2.0 gtk+-2.0 gthread-2.0 indicator>=0.3.19 x11 gconf-2.0)
22+pkg_check_modules(SERVICE_DEPS REQUIRED gobject-2.0 gio-2.0 gtk+-3.0 gthread-2.0 indicator>=0.3.19 x11 gconf-2.0)
23
24 execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} indicator --variable indicatordir OUTPUT_VARIABLE _indicatordir OUTPUT_STRIP_TRAILING_WHITESPACE)
25 execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} indicator --variable iconsdir OUTPUT_VARIABLE _iconsdir OUTPUT_STRIP_TRAILING_WHITESPACE)
26
27=== modified file 'src/PanelTray.cpp'
28--- src/PanelTray.cpp 2011-04-19 16:38:05 +0000
29+++ src/PanelTray.cpp 2011-05-18 09:36:31 +0000
30@@ -42,7 +42,7 @@
31 gtk_widget_set_name (_window, "UnityPanelApplet");
32 gtk_widget_set_colormap (_window, gdk_screen_get_rgba_colormap (gdk_screen_get_default ()));
33 gtk_widget_realize (_window);
34- gdk_window_set_back_pixmap (_window->window, NULL, FALSE);
35+ gdk_window_set_back_pixmap (gtk_widget_get_window(GTK_WIDGET(_window)), NULL, FALSE);
36 gtk_widget_set_app_paintable (_window, TRUE);
37 _tray_expose_id = g_signal_connect (_window, "expose-event", G_CALLBACK (PanelTray::OnTrayExpose), this);
38
39@@ -95,7 +95,7 @@
40 Window
41 PanelTray::GetTrayWindow ()
42 {
43- return GDK_WINDOW_XWINDOW (_window->window);
44+ return GDK_WINDOW_XWINDOW (gtk_widget_get_window(GTK_WIDGET(_window)));
45 }
46
47 void
48@@ -189,7 +189,7 @@
49 gboolean
50 PanelTray::OnTrayExpose (GtkWidget *widget, GdkEventExpose *ev, PanelTray *tray)
51 {
52- cairo_t *cr = gdk_cairo_create (widget->window);
53+ cairo_t *cr = gdk_cairo_create (gtk_widget_get_window(GTK_WIDGET(widget)));
54 GtkAllocation alloc;
55
56 gtk_widget_get_allocation (widget, &alloc);
57
58=== modified file 'tools/CMakeLists.txt'
59--- tools/CMakeLists.txt 2011-04-09 16:36:56 +0000
60+++ tools/CMakeLists.txt 2011-05-18 09:36:31 +0000
61@@ -11,7 +11,7 @@
62 # unity-preferences
63 #
64 find_package(PkgConfig)
65-pkg_check_modules(PREFS_DEPS REQUIRED gobject-2.0 gio-2.0 gtk+-2.0 gthread-2.0)
66+pkg_check_modules(PREFS_DEPS REQUIRED gobject-2.0 gio-2.0 gtk+-3.0 gthread-2.0)
67
68 set(CFLAGS
69 ${PREFS_DEPS_CFLAGS}