From f954a7777844e414a7a8019fadbf0e9322f96e54 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Thu, 13 Jul 2017 11:12:44 +0200 Subject: [PATCH 1/6] Add documentation badges --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4d5e4d65..668d34ae 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,10 @@ [![Build Status](https://travis-ci.org/hasufell/rust-libnotify.svg)](https://travis-ci.org/hasufell/rust-libnotify) [![Latest Version](https://img.shields.io/crates/v/libnotify.svg)](https://crates.io/crates/libnotify) +[![Documentation (crates.io)](https://img.shields.io/badge/documentation-docs.rs-df3600.svg)](https://docs.rs/libnotify) +[![Documentation (master)](https://img.shields.io/badge/documentation-master-yellow.svg)](https://hasufell.github.io/rust-libnotify/) [![Join the chat at https://gitter.im/hasufell/rust-libnotify](https://badges.gitter.im/hasufell/rust-libnotify.svg)](https://gitter.im/hasufell/rust-libnotify?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![License](https://img.shields.io/github/license/hasufell/rust-libnotify.svg)](https://github.com/hasufell/rust-libnotify) # rust-libnotify Rust binding to libnotify. - -* [Documentation (master)](https://hasufell.github.io/rust-libnotify/) -* [Documentation (crates.io)](https://docs.rs/crate/libnotify/) From 6536667a4d241301445ba7629ec62369587aff01 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Thu, 13 Jul 2017 11:20:23 +0200 Subject: [PATCH 2/6] Reorder bagdes, add download count badge --- README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 668d34ae..2d334960 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,12 @@ -[![Build Status](https://travis-ci.org/hasufell/rust-libnotify.svg)](https://travis-ci.org/hasufell/rust-libnotify) [![Latest Version](https://img.shields.io/crates/v/libnotify.svg)](https://crates.io/crates/libnotify) +[![License](https://img.shields.io/github/license/hasufell/rust-libnotify.svg)](https://github.com/hasufell/rust-libnotify) +[![Crate download count](https://img.shields.io/crates/d/libnotify.svg)](https://crates.io/crates/libnotify) + [![Documentation (crates.io)](https://img.shields.io/badge/documentation-docs.rs-df3600.svg)](https://docs.rs/libnotify) [![Documentation (master)](https://img.shields.io/badge/documentation-master-yellow.svg)](https://hasufell.github.io/rust-libnotify/) -[![Join the chat at https://gitter.im/hasufell/rust-libnotify](https://badges.gitter.im/hasufell/rust-libnotify.svg)](https://gitter.im/hasufell/rust-libnotify?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -[![License](https://img.shields.io/github/license/hasufell/rust-libnotify.svg)](https://github.com/hasufell/rust-libnotify) +[![Build Status](https://travis-ci.org/hasufell/rust-libnotify.svg)](https://travis-ci.org/hasufell/rust-libnotify) +[![Join the chat at https://gitter.im/hasufell/rust-libnotify](https://badges.gitter.im/hasufell/rust-libnotify.svg)](https://gitter.im/hasufell/rust-libnotify?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) # rust-libnotify Rust binding to libnotify. From a3d579d750cd0fdec7318f48930f93de17f6c9b5 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Thu, 13 Jul 2017 11:24:15 +0200 Subject: [PATCH 3/6] Fix LICENSE link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2d334960..3e9fe058 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![Latest Version](https://img.shields.io/crates/v/libnotify.svg)](https://crates.io/crates/libnotify) -[![License](https://img.shields.io/github/license/hasufell/rust-libnotify.svg)](https://github.com/hasufell/rust-libnotify) +[![License](https://img.shields.io/github/license/hasufell/rust-libnotify.svg)](LICENSE) [![Crate download count](https://img.shields.io/crates/d/libnotify.svg)](https://crates.io/crates/libnotify) [![Documentation (crates.io)](https://img.shields.io/badge/documentation-docs.rs-df3600.svg)](https://docs.rs/libnotify) From 8e955a6e08e178b9de368ad2d4ac8a5e2450857d Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Thu, 13 Jul 2017 11:35:04 +0200 Subject: [PATCH 4/6] Add badges to libnotify-sys --- libnotify-sys/README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libnotify-sys/README.md b/libnotify-sys/README.md index 4edb2db0..2ef496d6 100644 --- a/libnotify-sys/README.md +++ b/libnotify-sys/README.md @@ -1,3 +1,7 @@ +[![Latest Version](https://img.shields.io/crates/v/libnotify-sys.svg)](https://crates.io/crates/libnotify-sys) +[![License](https://img.shields.io/github/license/hasufell/rust-libnotify.svg)](../LICENSE) +[![Crate download count](https://img.shields.io/crates/d/libnotify-sys.svg)](https://crates.io/crates/libnotify-sys) + # rust-libnotify-sys Rust FFI declarations for libnotify From 831b761b02a7d5198755bad8f3557b2cefba85c5 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Thu, 13 Jul 2017 11:41:45 +0200 Subject: [PATCH 5/6] Explicitly add LICENSE to libnotify-sys subdir So we also make sure it ends up in the cargo crate. --- libnotify-sys/LICENSE | 21 +++++++++++++++++++++ libnotify-sys/README.md | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 libnotify-sys/LICENSE diff --git a/libnotify-sys/LICENSE b/libnotify-sys/LICENSE new file mode 100644 index 00000000..5d782fdb --- /dev/null +++ b/libnotify-sys/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2015 Mika Attila + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/libnotify-sys/README.md b/libnotify-sys/README.md index 2ef496d6..db122fce 100644 --- a/libnotify-sys/README.md +++ b/libnotify-sys/README.md @@ -1,5 +1,5 @@ [![Latest Version](https://img.shields.io/crates/v/libnotify-sys.svg)](https://crates.io/crates/libnotify-sys) -[![License](https://img.shields.io/github/license/hasufell/rust-libnotify.svg)](../LICENSE) +[![License](https://img.shields.io/github/license/hasufell/rust-libnotify.svg)](LICENSE) [![Crate download count](https://img.shields.io/crates/d/libnotify-sys.svg)](https://crates.io/crates/libnotify-sys) # rust-libnotify-sys From afcf7a75815fe60dd9c42e3f6c1aeecc15a75069 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Fri, 14 Jul 2017 00:47:21 +0200 Subject: [PATCH 6/6] Fix build against latest gtk-rs --- src/notification.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/notification.rs b/src/notification.rs index 1e74b474..0e7081e0 100644 --- a/src/notification.rs +++ b/src/notification.rs @@ -4,6 +4,7 @@ use gdk_pixbuf; use glib::translate::*; use glib; use glib_ffi; +use gobject_ffi; use std;