Upgrading to GitLab 11.10.0. Expect errors and see debian-infrastructure-announce@lists.debian.org for further information.

Commit 9970e841 authored by Andreas Rönnquist's avatar Andreas Rönnquist

Update upstream source from tag 'upstream/1.10'

Update to upstream version '1.10'
with Debian dir b2b6dd81f0053024dcee9ab440817f58b7b4ab60
parents 7be1069c 218b56fb
......@@ -2,6 +2,14 @@
ChangeLog:
----------
1.10
* Fix webpage link in about dialog
1.09
* Fix transient parent to dialogs, fixes warnings to stdout
* Clean up cppcheck output
* Various small fixes
1.08
* Fix sizes of properties dialog
* Fix output of GTK warnings in terminal
......
1.08
\ No newline at end of file
1.10
\ No newline at end of file
......@@ -32,7 +32,7 @@
#include "prefs.h"
gchar *homepage_string=(gchar*)"http://www.gusnan.se/sciteproj";
gchar *homepage_string=(gchar*)"https://www.nongnu.org/sciteproj";
gchar *sVersion = (gchar*)SCITEPROJ_VERSION;
......
/**
* gui.c - GUI code for SciteProj
*
* Copyright 2006 Roy Wood, 2009-2017 Andreas Rönnquist
* Copyright 2006 Roy Wood, 2009-2018 Andreas Rönnquist
*
* This file is part of SciteProj.
*
......@@ -749,9 +749,9 @@ static void tree_row_activated_cb(GtkTreeView *treeView,
goto EXITPOINT;
}
absFilePath=fix_path((gchar*)get_project_directory(), relFilePath);
absFilePath = fix_path((gchar*)get_project_directory(), relFilePath);
fixed=fix_path((gchar*)get_project_directory(), relFilePath);
fixed = fix_path((gchar*)get_project_directory(), relFilePath);
if ((command = g_strdup_printf("open:%s\n", fixed)) == NULL) {
g_set_error(&err, APP_SCITEPROJ_ERROR, -1,
......@@ -765,7 +765,7 @@ static void tree_row_activated_cb(GtkTreeView *treeView,
activate_scite(NULL);
if (prefs.give_scite_focus==TRUE) {
if (prefs.give_scite_focus == TRUE) {
send_scite_command((gchar*)"focus:0", NULL);
}
......@@ -1005,4 +1005,14 @@ void recent_files_switch_visible()
void set_dialog_transient(GtkWidget *dialog)
{
gtk_window_set_transient_for(GTK_WINDOW(dialog), GTK_WINDOW(sMainWindow));
}
\ No newline at end of file
}
/**
*
*/
GtkWindow *get_main_window()
{
return GTK_WINDOW(sMainWindow);
}
/**
* gui.h - GUI code for SciteProj
*
* Copyright 2006 Roy Wood, 2009-2017 Andreas Rönnquist
* Copyright 2006 Roy Wood, 2009-2018 Andreas Rönnquist
*
* This file is part of SciteProj.
*
......@@ -58,4 +58,6 @@ void recent_files_switch_visible();
void set_dialog_transient(GtkWidget *dialog);
extern GtkWindow *get_main_window();
#endif /*__HEADER_GUI_*/
/**
* main.c - main for SciteProj
*
* Copyright 2006 Roy Wood, 2009-2017 Andreas Rönnquist
* Copyright 2006 Roy Wood, 2009-2018 Andreas Rönnquist
*
* This file is part of SciteProj.
*
......@@ -217,7 +217,7 @@ int main(int argc, char *argv[])
// Check for SciTE
if (!check_if_scite_exists()) {
GtkWidget *warningDialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
GtkWidget *warningDialog = gtk_message_dialog_new(get_main_window(), GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
_("Warning! Couldn't locate SciTE!\n"
"Program will start, but you won't be able to open SciTE to edit files."));
gtk_dialog_run(GTK_DIALOG(warningDialog));
......
/**
* properties_dialog.c - Properties Dialogs code for SciteProj
*
* Copyright 2009-2017 Andreas Rönnquist
* Copyright 2009-2018 Andreas Rönnquist
*
* This file is part of SciteProj.
*
......@@ -55,7 +55,6 @@ void my_set_align(GtkWidget *widget)
*/
void group_properties_gui(GtkTreeModel *tree_model, GtkTreeIter *iter)
{
GError *err = NULL;
GtkWidget *dialog;
gchar *nodename = NULL;
......@@ -134,10 +133,6 @@ void group_properties_gui(GtkTreeModel *tree_model, GtkTreeIter *iter)
gtk_dialog_run(GTK_DIALOG(dialog));
//EXITPOINT:
if (err) g_error_free(err);
if (dialog) gtk_widget_destroy(dialog);
}
......
/**
* recent_files.c - list of recently opened files
*
* Copyright 2011-2017 Andreas Rönnquist
* Copyright 2011-2018 Andreas Rönnquist
*
* This file is part of SciteProj.
*
......@@ -311,7 +311,7 @@ gboolean add_file_to_recent(gchar *filepath, GError **err)
++fileExt;
}
if (fileExt == NULL || strlen(fileExt) <= 0) {
if (fileExt == NULL || (int)strlen(fileExt) <= 0) {
fileExt = (gchar*)fileName;
}
......
/**
* scite_utils_linux.c - Code for working with Scite (GNU/Linux version)
*
* Copyright 2006 Roy Wood, 2009-2017 Andreas Rönnquist
* Copyright 2006 Roy Wood, 2009-2018 Andreas Rönnquist
*
* This file is part of SciteProj.
*
......@@ -586,7 +586,7 @@ gboolean launch_scite(gchar *instring,GError **err)
// No luck yet, so display a progress dialog and wait a bit longer
if (usecs > usecsDialogDelay && !dialog) {
dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_CANCEL, _("Connecting to Scite...."));
dialog = gtk_message_dialog_new(get_main_window(), GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_CANCEL, _("Connecting to Scite...."));
g_signal_connect(dialog, "response", G_CALLBACK(cancel_button_cb), (void *) &userClickedCancel);
gtk_widget_show_all(dialog);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment