Merge branch 'fixes3' of https://github.com/Bob-IT/gnucash into maint

Gnucash · Apr 27, 2018 · d0fca77 · d0fca77
2 parents d69cdae + 196e7ea
commit d0fca77
Show file tree

Hide file tree

Showing 11 changed files with 338 additions and 194 deletions.
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -44,8 +44,6 @@ FOREACH(line ${TIP_OF_THE_DAY_LINES})
   LIST(APPEND TOTD_OUTPUT "${line3}\n")
 ENDFOREACH()
 
-LIST(APPEND TOTD_OUTPUT "\n")
-
 STRING(CONCAT FINAL_TOTD ${TOTD_OUTPUT})
 
 FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/tip_of_the_day.list "${FINAL_TOTD}")

diff --git a/gnucash/gnome-utils/gnc-main-window.c b/gnucash/gnome-utils/gnc-main-window.c
@@ -172,7 +172,6 @@ static void gnc_main_window_cmd_help_contents (GtkAction *action, GncMainWindow
 static void gnc_main_window_cmd_help_about (GtkAction *action, GncMainWindow *window);
 
 static void do_popup_menu(GncPluginPage *page, GdkEventButton *event);
-static gboolean gnc_main_window_popup_menu_cb (GtkWidget *widget, GncPluginPage *page);
 static GtkWidget *gnc_main_window_get_statusbar (GncWindow *window_in);
 static void statusbar_notification_lastmodified(void);
 
@@ -4797,7 +4796,7 @@ do_popup_menu(GncPluginPage *page, GdkEventButton *event)
  *  @return Always returns TRUE to indicate that the menu request was
  *  handled.
  */
-static gboolean
+gboolean
 gnc_main_window_popup_menu_cb (GtkWidget *widget,
                                GncPluginPage *page)
 {

diff --git a/gnucash/gnome-utils/gnc-main-window.h b/gnucash/gnome-utils/gnc-main-window.h
@@ -322,6 +322,24 @@ gboolean gnc_main_window_button_press_cb (GtkWidget *whatever,
         GdkEventButton *event,
         GncPluginPage *page);
 
+
+/** Callback function invoked when the user requests that Gnucash
+ *  popup the contextual menu via the keyboard context-menu request
+ *  key combination (Shift-F10 by default).
+ *
+ *  @param page This is the GncPluginPage corresponding to the visible
+ *  page.
+ *
+ *  @param widget Whatever widget had focus when the user issued the
+ *  keyboard context-menu request.
+ *
+ *  @return Always returns TRUE to indicate that the menu request was
+ *  handled.
+ */
+gboolean gnc_main_window_popup_menu_cb (GtkWidget *widget,
+        GncPluginPage *page);
+
+
 /** Restore the persistent state of all windows.
  *
  *  @param keyfile The GKeyFile containing persistent window state.