Merge branch 'geany:master' into master

Author: Alex313031

NEWS

@@ -7,7 +7,7 @@ Geany 2.0 (October 19, 2023)
     * Split "session data" into session.conf, preferences are written to
       and read from geany.conf (PR#2776, PR#2779, PR#3014, PR#3125 and more).
     * Add new build system Meson (experimental) (PR#2761).
-    * Require GTK 3.24 (#3580).
+    * Require GTK 3.24 (PR#3580).
 
     Bug fixes
     * (Re-)Add ability to scroll over document tabs (Luke Horwell, PR#3134).

autogen.sh

@@ -8,7 +8,7 @@ test -z "$srcdir" && srcdir=.
 
 DIE=0
 
-(test -f $srcdir/configure.ac) || {
+(test -f "$srcdir/configure.ac") || {
 	echo "**Error**: Directory "\`$srcdir\'" does not look like the top-level package directory"
 	exit 1
 }
@@ -30,11 +30,11 @@ fi
 
 echo "Processing configure.ac"
 
-(cd $srcdir; autoreconf --install --verbose)
+(cd "$srcdir"; autoreconf --install --verbose)
 
 if [ "$NOCONFIGURE" = 1 ]; then
     echo "Done. configure skipped."
     exit 0;
 fi
 echo "Running $srcdir/configure $@ ..."
-$srcdir/configure "$@" && echo "Now type 'make' to compile." || exit 1
+"$srcdir/configure" "$@" && echo "Now type 'make' to compile." || exit 1

plugins/filebrowser.c

@@ -317,7 +317,7 @@ static void refresh(void)
 	GSList *list, *node;
 
 	/* don't clear when the new path doesn't exist */
-	if (! g_file_test(current_dir, G_FILE_TEST_EXISTS))
+	if (! current_dir || ! g_file_test(current_dir, G_FILE_TEST_EXISTS))
 		return;
 
 	clear();

po/Makevars

@@ -12,7 +12,7 @@ subdir = po
 top_builddir = ..
 
 # These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 --from-code=UTF-8 -c"Translators:"
 
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding

src/about.c

@@ -330,6 +330,14 @@ static GtkWidget *create_dialog(void)
 	ROW("", row, 0, 0, 0, 0);
 	row++;
 
+	g_snprintf(buffer, sizeof(buffer), "Jiří Techet - %s", _("developer"));
+	ROW(buffer, row, 0, 0, 0, 1);
+	row++;
+	ROW("<[email protected]>", row, 0, 0, 0, 1);
+	row++;
+	ROW("", row, 0, 0, 0, 0);
+	row++;
+
 	g_snprintf(buffer, sizeof(buffer), "Matthew Brush - %s", _("developer"));
 	ROW(buffer, row, 0, 0, 0, 1);
 	row++;

src/document.c

@@ -1235,7 +1235,7 @@ void document_apply_indent_settings(GeanyDocument *doc)
 					name = _("Tabs and Spaces");
 					break;
 			}
-			/* For translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs
+			/* Translators: first wildcard is the indentation mode (Spaces, Tabs, Tabs
 			 * and Spaces), the second one is the filename */
 			ui_set_statusbar(TRUE, _("Setting %s indentation mode for %s."), name,
 				DOC_FILENAME(doc));
@@ -1484,7 +1484,7 @@ GeanyDocument *document_open_file_full(GeanyDocument *doc, const gchar *filename
 		else
 		{
 			g_signal_emit_by_name(geany_object, "document-open", doc);
-			/* For translators: this is the status window message for opening a file. %d is the number
+			/* Translators: this is the status window message for opening a file. %d is the number
 			 * of the newly opened file, %s indicates whether the file is opened read-only
 			 * (it is replaced with the string ", read-only"). */
 			msgwin_status_add(_("File %s opened (%d%s)."),

src/geanyentryaction.c

@@ -40,7 +40,6 @@ typedef struct _GeanyEntryActionPrivate		GeanyEntryActionPrivate;
 
 struct _GeanyEntryActionPrivate
 {
-	GtkWidget	*entry;
 	gboolean	 numeric;
 };
 
@@ -58,81 +57,64 @@ static guint signals[LAST_SIGNAL];
 G_DEFINE_TYPE(GeanyEntryAction, geany_entry_action, GTK_TYPE_ACTION)
 
 
-static GtkWidget *geany_entry_action_create_tool_item(GtkAction *action)
-{
-	GtkWidget *toolitem;
-	GeanyEntryActionPrivate *priv = GEANY_ENTRY_ACTION_GET_PRIVATE(action);
-
-	priv->entry = gtk_entry_new();
-	if (priv->numeric)
-		gtk_entry_set_width_chars(GTK_ENTRY(priv->entry), 9);
-
-	ui_entry_add_clear_icon(GTK_ENTRY(priv->entry));
-	ui_entry_add_activate_backward_signal(GTK_ENTRY(priv->entry));
-
-	gtk_widget_show(priv->entry);
-
-	toolitem = g_object_new(GTK_TYPE_TOOL_ITEM, NULL);
-	gtk_container_add(GTK_CONTAINER(toolitem), priv->entry);
-
-	return toolitem;
-}
-
-
 static void delegate_entry_activate_cb(GtkEntry *entry, GeanyEntryAction *action)
 {
-	GeanyEntryActionPrivate *priv = GEANY_ENTRY_ACTION_GET_PRIVATE(action);
-	const gchar *text = gtk_entry_get_text(GTK_ENTRY(priv->entry));
+	const gchar *text = gtk_entry_get_text(entry);
 
 	g_signal_emit(action, signals[ENTRY_ACTIVATE], 0, text);
 }
 
 
 static void delegate_entry_activate_backward_cb(GtkEntry *entry, GeanyEntryAction *action)
 {
-	GeanyEntryActionPrivate *priv = GEANY_ENTRY_ACTION_GET_PRIVATE(action);
-	const gchar *text = gtk_entry_get_text(GTK_ENTRY(priv->entry));
+	const gchar *text = gtk_entry_get_text(entry);
 
 	g_signal_emit(action, signals[ENTRY_ACTIVATE_BACKWARD], 0, text);
 }
 
 
 static void delegate_entry_changed_cb(GtkEditable *editable, GeanyEntryAction *action)
 {
-	GeanyEntryActionPrivate *priv = GEANY_ENTRY_ACTION_GET_PRIVATE(action);
-	const gchar *text = gtk_entry_get_text(GTK_ENTRY(priv->entry));
+	const gchar *text = gtk_entry_get_text(GTK_ENTRY(editable));
 
 	g_signal_emit(action, signals[ENTRY_CHANGED], 0, text);
 }
 
 
-static void geany_entry_action_connect_proxy(GtkAction *action, GtkWidget *widget)
+static GtkWidget *geany_entry_action_create_tool_item(GtkAction *action)
 {
+	GtkWidget *toolitem;
+	GtkWidget *entry;
 	GeanyEntryActionPrivate *priv = GEANY_ENTRY_ACTION_GET_PRIVATE(action);
 
-	/* make sure not to connect handlers twice */
-	if (! g_object_get_data(G_OBJECT(widget), "gea-connected"))
-	{
-		if (priv->numeric)
-			g_signal_connect(priv->entry, "insert-text",
-				G_CALLBACK(ui_editable_insert_text_callback), NULL);
-		g_signal_connect(priv->entry, "changed", G_CALLBACK(delegate_entry_changed_cb), action);
-		g_signal_connect(priv->entry, "activate", G_CALLBACK(delegate_entry_activate_cb), action);
-		g_signal_connect(priv->entry, "activate-backward",
-			G_CALLBACK(delegate_entry_activate_backward_cb), action);
-
-		g_object_set_data(G_OBJECT(widget), "gea-connected", action /* anything non-NULL */);
-	}
-
-	GTK_ACTION_CLASS(geany_entry_action_parent_class)->connect_proxy(action, widget);
+	entry = gtk_entry_new();
+	if (priv->numeric)
+		gtk_entry_set_width_chars(GTK_ENTRY(entry), 9);
+
+	ui_entry_add_clear_icon(GTK_ENTRY(entry));
+	ui_entry_add_activate_backward_signal(GTK_ENTRY(entry));
+
+	if (priv->numeric)
+		g_signal_connect(entry, "insert-text",
+			G_CALLBACK(ui_editable_insert_text_callback), NULL);
+	g_signal_connect(entry, "changed", G_CALLBACK(delegate_entry_changed_cb), action);
+	g_signal_connect(entry, "activate", G_CALLBACK(delegate_entry_activate_cb), action);
+	g_signal_connect(entry, "activate-backward",
+		G_CALLBACK(delegate_entry_activate_backward_cb), action);
+
+	gtk_widget_show(entry);
+
+	toolitem = g_object_new(GTK_TYPE_TOOL_ITEM, NULL);
+	gtk_container_add(GTK_CONTAINER(toolitem), entry);
+
+	return toolitem;
 }
 
 
 static void geany_entry_action_class_init(GeanyEntryActionClass *klass)
 {
 	GtkActionClass *action_class = GTK_ACTION_CLASS(klass);
 
-	action_class->connect_proxy = geany_entry_action_connect_proxy;
 	action_class->create_tool_item = geany_entry_action_create_tool_item;
 	action_class->toolbar_item_type = GTK_TYPE_MENU_TOOL_BUTTON;
 
@@ -173,7 +155,6 @@ static void geany_entry_action_init(GeanyEntryAction *action)
 		GEANY_ENTRY_ACTION_TYPE, GeanyEntryActionPrivate);
 
 	priv = action->priv;
-	priv->entry = NULL;
 	priv->numeric = FALSE;
 }
 

src/libmain.c

@@ -599,7 +599,7 @@ static void parse_command_line_options(gint *argc, gchar ***argv)
 		gchar *build_date = utils_parse_and_format_build_date(__DATE__);
 
 		printf(PACKAGE " %s (", main_get_version_string());
-		/* note for translators: library versions are printed after this */
+		/* Translators: library versions are printed after this */
 		printf(_("built on %s with "), build_date);
 		printf(geany_lib_versions,
 			GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION,
@@ -712,7 +712,7 @@ static gint create_config_dir(void)
 				else
 				{
 					dialogs_show_msgbox(GTK_MESSAGE_WARNING,
-						/* for translators: the third %s in brackets is the error message which
+						/* Translators: the third %s in brackets is the error message which
 						 * describes why moving the dir didn't work */
 						_("Your old configuration directory \"%s\" could not be moved to \"%s\" (%s). "
 						  "Please move manually the directory to the new location."),

src/project.c

@@ -96,7 +96,7 @@ static void destroy_project(gboolean open_default);
 #define SHOW_ERR(args) dialogs_show_msgbox(GTK_MESSAGE_ERROR, args)
 #define SHOW_ERR1(args, more) dialogs_show_msgbox(GTK_MESSAGE_ERROR, args, more)
 #define MAX_NAME_LEN 50
-/* "projects" is part of the default project base path so be careful when translating
+/* Translators: "projects" is part of the default project base path so be careful when translating
  * please avoid special characters and spaces, look at the source for details or ask Frank */
 #define PROJECT_DIR _("projects")