Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Compile against GTK+3 #2

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Compile against GTK+3 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
40eb977
Add .gitignore file
hbons Oct 8, 2013
c020051
Compile using GTK+3
hbons Oct 8, 2013
12544bc
Fix compiler warning
hbons Oct 8, 2013
5975a6c
Adjust .pc file
hbons Oct 9, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,6 @@ notify-sharp.pc
*.user*
*.pidb
bin/
docs/notify-sharp-docs.tree
docs/notify-sharp-docs.zip
src/notify-sharp.dll
4 changes: 2 additions & 2 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ else
AM_CONDITIONAL(BUILD_DOCS, false)
fi

GTK_SHARP_REQ_VERSION=2.10.1
PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= $GTK_SHARP_REQ_VERSION)
GTK_SHARP_REQ_VERSION=2.99.1
PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-3.0 >= $GTK_SHARP_REQ_VERSION)
AC_SUBST(GTK_SHARP_LIBS)

DBUS_SHARP_REQ_VERSION=0.7
Expand Down
18 changes: 9 additions & 9 deletions notify-sharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,25 +53,25 @@
<Package>dbus-sharp-glib-1.0</Package>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
<Reference Include="gtk-sharp, Version=2.99.1.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
<Private>False</Private>
<Package>gtk-sharp-2.0</Package>
<Package>gtk-sharp-3.0</Package>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
<Reference Include="atk-sharp, Version=2.99.1.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
<Private>False</Private>
<Package>gtk-sharp-2.0</Package>
<Package>gtk-sharp-3.0</Package>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
<Reference Include="gdk-sharp, Version=2.99.1.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
<Private>False</Private>
<Package>gtk-sharp-2.0</Package>
<Package>gtk-sharp-3.0</Package>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
<Reference Include="glib-sharp, Version=2.99.1.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
<Private>False</Private>
<Package>glib-sharp-2.0</Package>
<Package>glib-sharp-3.0</Package>
<SpecificVersion>False</SpecificVersion>
</Reference>
</ItemGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion notify-sharp.pc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ pkglibdir=${libdir}/mono/notify-sharp
Name: notify-sharp
Description: C# client library for notification-daemon
Version: @VERSION@
Requires: gtk-sharp-2.0
Requires: gtk-sharp-3.0
Libs: -r:${pkglibdir}/notify-sharp.dll

2 changes: 1 addition & 1 deletion src/Notification.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ private void SetPixbufHint (Pixbuf pixbuf) {
public void AttachToWidget (Gtk.Widget widget) {
int x, y;

widget.GdkWindow.GetOrigin (out x, out y);
widget.Window.GetOrigin (out x, out y);

if (widget.GetType() != typeof (Gtk.Window) || ! widget.GetType().IsSubclassOf(typeof (Gtk.Window))) {
x += widget.Allocation.X;
Expand Down