[gnote] Remove screen parameter from show_help
- From: Aurimas Černius <aurimasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnote] Remove screen parameter from show_help
- Date: Sun, 23 Jul 2017 10:14:01 +0000 (UTC)
commit 634c47e77039b20171dfa3b5a232e597c78d8aa5
Author: Aurimas Černius <aurisc4 gmail com>
Date: Sun Jul 23 12:45:29 2017 +0300
Remove screen parameter from show_help
.../tableofcontents/tableofcontentsnoteaddin.cpp | 4 ++--
src/gnote.cpp | 3 +--
src/notewindow.cpp | 3 +--
src/recentchanges.cpp | 2 +-
src/utils.cpp | 3 +--
src/utils.hpp | 3 +--
6 files changed, 7 insertions(+), 11 deletions(-)
---
diff --git a/src/addins/tableofcontents/tableofcontentsnoteaddin.cpp
b/src/addins/tableofcontents/tableofcontentsnoteaddin.cpp
index 2fc454d..d970061 100644
--- a/src/addins/tableofcontents/tableofcontentsnoteaddin.cpp
+++ b/src/addins/tableofcontents/tableofcontentsnoteaddin.cpp
@@ -3,7 +3,7 @@
* It lists note's table of contents in a menu.
*
* Copyright (C) 2013 Luc Pionchon <pionchon luc gmail com>
- * Copyright (C) 2013,2015-2016 Aurimas Cernius <aurisc4 gmail com>
+ * Copyright (C) 2013,2015-2017 Aurimas Cernius <aurisc4 gmail com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -381,7 +381,7 @@ void TableofcontentsNoteAddin::on_toc_help_activated()
{
gnote::NoteWindow* window = get_window();
gnote::utils::show_help("gnote", "addin-tableofcontents",
- window->get_screen()->gobj(), dynamic_cast<Gtk::Window*>(window->host()));
+ dynamic_cast<Gtk::Window*>(window->host()));
}
diff --git a/src/gnote.cpp b/src/gnote.cpp
index c10d199..9921455 100644
--- a/src/gnote.cpp
+++ b/src/gnote.cpp
@@ -260,8 +260,7 @@ namespace gnote {
void Gnote::on_show_help_action(const Glib::VariantBase&)
{
- GdkScreen *cscreen = NULL;
- utils::show_help("gnote", "", cscreen, NULL);
+ utils::show_help("gnote", "", &get_main_window());
}
void Gnote::on_show_help_shortcust_action(const Glib::VariantBase&)
diff --git a/src/notewindow.cpp b/src/notewindow.cpp
index 3214e23..2e117b0 100644
--- a/src/notewindow.cpp
+++ b/src/notewindow.cpp
@@ -556,8 +556,7 @@ namespace gnote {
void NoteWindow::open_help_activate()
{
- utils::show_help("gnote", "editing-notes", get_screen()->gobj(),
- dynamic_cast<Gtk::Window*>(host()));
+ utils::show_help("gnote", "editing-notes", dynamic_cast<Gtk::Window*>(host()));
}
void NoteWindow::change_depth_right_handler()
diff --git a/src/recentchanges.cpp b/src/recentchanges.cpp
index e0e69b2..0de45b6 100644
--- a/src/recentchanges.cpp
+++ b/src/recentchanges.cpp
@@ -432,7 +432,7 @@ namespace gnote {
}
break;
case GDK_KEY_F1:
- utils::show_help("gnote", "", get_screen()->gobj(), this);
+ utils::show_help("gnote", "", this);
break;
default:
break;
diff --git a/src/utils.cpp b/src/utils.cpp
index b89af67..27d9919 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -152,8 +152,7 @@ namespace gnote {
}
- void show_help(const Glib::ustring & filename, const Glib::ustring & link_id,
- GdkScreen *screen, Gtk::Window *parent)
+ void show_help(const Glib::ustring & filename, const Glib::ustring & link_id, Gtk::Window *parent)
{
// "help:" URIs are "help:document[/page][?query][#frag]"
// See resolve_help_uri () at,
diff --git a/src/utils.hpp b/src/utils.hpp
index 8336138..a1ae8ec 100644
--- a/src/utils.hpp
+++ b/src/utils.hpp
@@ -51,8 +51,7 @@ namespace gnote {
void popup_menu(Gtk::Menu &menu, const GdkEventButton *);
- void show_help(const Glib::ustring & filename, const Glib::ustring & link_id,
- GdkScreen *screen, Gtk::Window *parent);
+ void show_help(const Glib::ustring & filename, const Glib::ustring & link_id, Gtk::Window *parent);
void open_url(const Glib::ustring & url);
void show_opening_location_error(Gtk::Window * parent,
const Glib::ustring & url,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]