summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/builds.yml4
-rw-r--r--.github/workflows/release.yml2
-rw-r--r--accessx-status/docs/tzm/tzm.po2
-rw-r--r--battstat/docs/tzm/tzm.po2
-rw-r--r--charpick/help/tzm/tzm.po2
-rw-r--r--cpufreq/help/tzm/tzm.po2
-rw-r--r--drivemount/help/tzm/tzm.po2
-rw-r--r--drivemount/src/drive-button.c9
-rw-r--r--geyes/docs/tzm/tzm.po2
-rw-r--r--mateweather/docs/tzm/tzm.po2
-rw-r--r--multiload/docs/tzm/tzm.po2
-rw-r--r--netspeed/help/tzm/tzm.po2
-rw-r--r--netspeed/src/backend.c15
-rw-r--r--po/ro.po1
-rw-r--r--stickynotes/docs/tzm/tzm.po2
-rw-r--r--stickynotes/org.mate.stickynotes.gschema.xml.in5
-rw-r--r--stickynotes/sticky-notes-preferences.ui17
-rw-r--r--stickynotes/stickynotes.c45
-rw-r--r--stickynotes/stickynotes.h3
-rw-r--r--stickynotes/stickynotes_applet.c14
-rw-r--r--stickynotes/stickynotes_applet.h2
-rw-r--r--stickynotes/stickynotes_applet_callbacks.c14
-rw-r--r--stickynotes/stickynotes_callbacks.c3
-rw-r--r--trashapplet/docs/tzm/tzm.po2
24 files changed, 140 insertions, 16 deletions
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index 01b3ba8e..f97934e8 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -69,7 +69,7 @@ jobs:
pacman --noconfirm -Sy git || true
echo "::endgroup::"
- name: Repository checkout
- uses: actions/checkout@v6
+ uses: actions/checkout@v7
- name: Install dependency packages
run: .github/workflows/${{ env.DISTRO }}.sh
- name: Enable ccache to speed up builds
@@ -79,7 +79,7 @@ jobs:
# INFO: Depends on mate-desktop 1.27.1+, so we should install it from source.
- name: Cache mate-desktop binary packages
- uses: actions/cache@v5
+ uses: actions/cache@v6
id: cache-mate-desktop
with:
path: ${{ env.CACHE_PATH }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 00327658..3257e840 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Repository checkout
- uses: actions/checkout@v6
+ uses: actions/checkout@v7
- name: Install dependency packages
run: sudo .github/workflows/ubuntu.sh
diff --git a/accessx-status/docs/tzm/tzm.po b/accessx-status/docs/tzm/tzm.po
index 78d130f6..4dfea980 100644
--- a/accessx-status/docs/tzm/tzm.po
+++ b/accessx-status/docs/tzm/tzm.po
@@ -13,7 +13,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: tzm\n"
-"Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n"
+"Plural-Forms: nplurals=2; plural=n >= 2 && (n < 11 || n > 99);\n"
#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
msgctxt "_"
diff --git a/battstat/docs/tzm/tzm.po b/battstat/docs/tzm/tzm.po
index 69e3957d..d4001ca7 100644
--- a/battstat/docs/tzm/tzm.po
+++ b/battstat/docs/tzm/tzm.po
@@ -13,7 +13,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: tzm\n"
-"Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n"
+"Plural-Forms: nplurals=2; plural=n >= 2 && (n < 11 || n > 99);\n"
#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
msgctxt "_"
diff --git a/charpick/help/tzm/tzm.po b/charpick/help/tzm/tzm.po
index 1071748c..bec0fe10 100644
--- a/charpick/help/tzm/tzm.po
+++ b/charpick/help/tzm/tzm.po
@@ -13,7 +13,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: tzm\n"
-"Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n"
+"Plural-Forms: nplurals=2; plural=n >= 2 && (n < 11 || n > 99);\n"
#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
msgctxt "_"
diff --git a/cpufreq/help/tzm/tzm.po b/cpufreq/help/tzm/tzm.po
index 9957726e..4c3181c0 100644
--- a/cpufreq/help/tzm/tzm.po
+++ b/cpufreq/help/tzm/tzm.po
@@ -13,7 +13,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: tzm\n"
-"Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n"
+"Plural-Forms: nplurals=2; plural=n >= 2 && (n < 11 || n > 99);\n"
#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
msgctxt "_"
diff --git a/drivemount/help/tzm/tzm.po b/drivemount/help/tzm/tzm.po
index cf511229..57ab5522 100644
--- a/drivemount/help/tzm/tzm.po
+++ b/drivemount/help/tzm/tzm.po
@@ -13,7 +13,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: tzm\n"
-"Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n"
+"Plural-Forms: nplurals=2; plural=n >= 2 && (n < 11 || n > 99);\n"
#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
msgctxt "_"
diff --git a/drivemount/src/drive-button.c b/drivemount/src/drive-button.c
index d33600f0..80f4b7ce 100644
--- a/drivemount/src/drive-button.c
+++ b/drivemount/src/drive-button.c
@@ -144,6 +144,15 @@ drive_button_dispose (GObject *object)
{
DriveButton *self = DRIVE_BUTTON (object);
+ /* The "changed" handler was connected to the process-global default icon
+ * theme (see drive_button_new / drive_button_new_from_mount), which
+ * outlives this button. If we don't disconnect it, the theme keeps a
+ * dangling pointer to the freed button and a later "changed" emission
+ * schedules drive_button_update() on freed memory -> use-after-free crash. */
+ g_signal_handlers_disconnect_by_func (gtk_icon_theme_get_default (),
+ G_CALLBACK (drive_button_theme_change),
+ self);
+
drive_button_set_volume (self, NULL);
if (self->update_tag)
diff --git a/geyes/docs/tzm/tzm.po b/geyes/docs/tzm/tzm.po
index 333ddfb7..a95a8947 100644
--- a/geyes/docs/tzm/tzm.po
+++ b/geyes/docs/tzm/tzm.po
@@ -13,7 +13,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: tzm\n"
-"Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n"
+"Plural-Forms: nplurals=2; plural=n >= 2 && (n < 11 || n > 99);\n"
#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
msgctxt "_"
diff --git a/mateweather/docs/tzm/tzm.po b/mateweather/docs/tzm/tzm.po
index c73b2b9f..81d5ef4a 100644
--- a/mateweather/docs/tzm/tzm.po
+++ b/mateweather/docs/tzm/tzm.po
@@ -13,7 +13,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: tzm\n"
-"Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n"
+"Plural-Forms: nplurals=2; plural=n >= 2 && (n < 11 || n > 99);\n"
#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
msgctxt "_"
diff --git a/multiload/docs/tzm/tzm.po b/multiload/docs/tzm/tzm.po
index 4285e3a7..45388a14 100644
--- a/multiload/docs/tzm/tzm.po
+++ b/multiload/docs/tzm/tzm.po
@@ -13,7 +13,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: tzm\n"
-"Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n"
+"Plural-Forms: nplurals=2; plural=n >= 2 && (n < 11 || n > 99);\n"
#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
msgctxt "_"
diff --git a/netspeed/help/tzm/tzm.po b/netspeed/help/tzm/tzm.po
index 07042c52..af300ffc 100644
--- a/netspeed/help/tzm/tzm.po
+++ b/netspeed/help/tzm/tzm.po
@@ -13,7 +13,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: tzm\n"
-"Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n"
+"Plural-Forms: nplurals=2; plural=n >= 2 && (n < 11 || n > 99);\n"
#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
msgctxt "_"
diff --git a/netspeed/src/backend.c b/netspeed/src/backend.c
index e1321497..cd369200 100644
--- a/netspeed/src/backend.c
+++ b/netspeed/src/backend.c
@@ -64,10 +64,20 @@ struct nl80211_state {
#endif /* HAVE_NL */
+static gboolean
+device_exists (const char *device)
+{
+ return (if_nametoindex (device) != 0);
+}
+
gboolean
is_dummy_device (const char* device)
{
glibtop_netload netload;
+
+ if (!device_exists (device))
+ return TRUE;
+
glibtop_get_netload (&netload, device);
if (netload.if_flags & (1 << GLIBTOP_IF_FLAGS_LOOPBACK))
@@ -332,6 +342,11 @@ get_device_info (const char *device,
devinfo->name = g_strdup (device);
devinfo->type = DEV_UNKNOWN;
+ /* Device doesn't exist.
+ * Return so the auto-change logic can find an active device. */
+ if (!device_exists (device))
+ return;
+
glibtop_get_netload (&netload, device);
devinfo->up = (netload.if_flags & (1L << GLIBTOP_IF_FLAGS_UP) ? TRUE : FALSE);
diff --git a/po/ro.po b/po/ro.po
index 0320e97e..f3bf811d 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -2003,6 +2003,7 @@ msgstr "global"
#: netspeed/src/backend.c:586
#, c-format
+#, fuzzy
msgid "%d.%d MBit/s"
msgstr "MBit/s"
diff --git a/stickynotes/docs/tzm/tzm.po b/stickynotes/docs/tzm/tzm.po
index f89a2f13..0338c883 100644
--- a/stickynotes/docs/tzm/tzm.po
+++ b/stickynotes/docs/tzm/tzm.po
@@ -13,7 +13,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: tzm\n"
-"Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n"
+"Plural-Forms: nplurals=2; plural=n >= 2 && (n < 11 || n > 99);\n"
#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
msgctxt "_"
diff --git a/stickynotes/org.mate.stickynotes.gschema.xml.in b/stickynotes/org.mate.stickynotes.gschema.xml.in
index c173f383..17eced67 100644
--- a/stickynotes/org.mate.stickynotes.gschema.xml.in
+++ b/stickynotes/org.mate.stickynotes.gschema.xml.in
@@ -70,5 +70,10 @@
<summary>Whether to hide all notes when click the icon</summary>
<description>If this option is disabled, the note is not hidden when the icon is clicked.</description>
</key>
+ <key name="fixed-size" type="b">
+ <default>false</default>
+ <summary>Whether to prevent note resizing on all notes</summary>
+ <description>If this option is enabled, resizing is restricted on all notes.</description>
+ </key>
</schema>
</schemalist>
diff --git a/stickynotes/sticky-notes-preferences.ui b/stickynotes/sticky-notes-preferences.ui
index 25ebfe33..8b916f44 100644
--- a/stickynotes/sticky-notes-preferences.ui
+++ b/stickynotes/sticky-notes-preferences.ui
@@ -390,6 +390,23 @@
<property name="width">2</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton" id="fixed_size_check">
+ <property name="label" translatable="yes">Force fixed size notes</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="tooltip_text" translatable="yes">Choose whether to restrict notes resizing</property>
+ <property name="halign">start</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
diff --git a/stickynotes/stickynotes.c b/stickynotes/stickynotes.c
index e1e1f8cb..1a1422a4 100644
--- a/stickynotes/stickynotes.c
+++ b/stickynotes/stickynotes.c
@@ -86,7 +86,7 @@ static void
buffer_changed (GtkTextBuffer *buffer,
StickyNote *note)
{
- if ( (note->h + note->y) > stickynotes->max_height )
+ if ( (note->h + note->y) > stickynotes->max_height && (!note->force_fixed_size) )
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (note->w_scroller),
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
@@ -201,6 +201,7 @@ stickynote_new_aux (GdkScreen *screen,
note->font_color = NULL;
note->font = NULL;
note->locked = FALSE;
+ note->force_fixed_size = FALSE;
note->x = x;
note->y = y;
note->w = w;
@@ -256,6 +257,8 @@ stickynote_new_aux (GdkScreen *screen,
stickynote_set_font (note, NULL, TRUE);
stickynote_set_locked (note, FALSE);
+ stickynote_set_fixed_size (note, stickynotes->force_fixed_size);
+
gtk_widget_realize (note->w_window);
/* Connect a popup menu to all buttons and title */
@@ -763,6 +766,46 @@ stickynote_set_visible (StickyNote *note,
}
}
+/* Set forced fixed size */
+void stickynote_set_fixed_size (StickyNote *note,
+ gboolean force_fixed_size)
+{
+ note->force_fixed_size = force_fixed_size;
+
+ if (force_fixed_size) {
+ gint w, h;
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (note->w_scroller),
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (note->w_body),
+ GTK_WRAP_CHAR);
+ gtk_widget_set_visible (note->w_resize_se, FALSE);
+ gtk_widget_set_visible (note->w_resize_sw, FALSE);
+ if (note->w == 0 && note->h == 0) {
+ w = g_settings_get_int (stickynotes->settings, "default-width");
+ h = g_settings_get_int (stickynotes->settings, "default-height");
+ }
+ else {
+ w = note->w;
+ h = note->h;
+ }
+ gtk_window_set_default_size (GTK_WINDOW (note->w_window), w, h);
+ gtk_window_resize (GTK_WINDOW (note->w_window), w, h);
+ gtk_window_set_resizable (GTK_WINDOW (note->w_window), FALSE);
+ }
+ else {
+ GtkPolicyType vscroll_pol = GTK_POLICY_NEVER;
+ if ((note->h + note->y) > stickynotes->max_height)
+ vscroll_pol = GTK_POLICY_AUTOMATIC;
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (note->w_scroller),
+ GTK_POLICY_NEVER, vscroll_pol);
+ gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (note->w_body),
+ GTK_WRAP_WORD);
+ gtk_widget_set_visible (note->w_resize_se, TRUE);
+ gtk_widget_set_visible (note->w_resize_sw, TRUE);
+ gtk_window_set_resizable (GTK_WINDOW (note->w_window), TRUE);
+ }
+}
+
/* Add a sticky note */
void
stickynotes_add (GdkScreen *screen)
diff --git a/stickynotes/stickynotes.h b/stickynotes/stickynotes.h
index 5f42abfa..151bf10e 100644
--- a/stickynotes/stickynotes.h
+++ b/stickynotes/stickynotes.h
@@ -61,6 +61,7 @@ typedef struct
gchar *font_color; /* Font color */
gchar *font; /* Note font */
gboolean locked; /* Note locked state */
+ gboolean force_fixed_size; /* Note resizing is restricted */
gint x; /* Note x-coordinate */
gint y; /* Note y-coordinate */
@@ -89,6 +90,8 @@ void stickynote_set_locked (StickyNote *note,
gboolean locked);
void stickynote_set_visible (StickyNote *note,
gboolean visible);
+void stickynote_set_fixed_size (StickyNote *note,
+ gboolean force_fixed_size);
void stickynote_change_properties (StickyNote *note);
diff --git a/stickynotes/stickynotes_applet.c b/stickynotes/stickynotes_applet.c
index 0fb9b6a9..fa777efe 100644
--- a/stickynotes/stickynotes_applet.c
+++ b/stickynotes/stickynotes_applet.c
@@ -283,6 +283,9 @@ stickynotes_applet_init_prefs (void)
stickynotes->w_prefs_desktop =
GTK_WIDGET (&GTK_CHECK_BUTTON (gtk_builder_get_object (stickynotes->builder,
"desktop_hide_check"))->toggle_button);
+ stickynotes->w_prefs_fixed_size =
+ GTK_WIDGET (&GTK_CHECK_BUTTON (gtk_builder_get_object (stickynotes->builder,
+ "fixed_size_check"))->toggle_button);
g_signal_connect (stickynotes->w_prefs, "response",
G_CALLBACK (preferences_response_cb), NULL);
@@ -308,6 +311,8 @@ stickynotes_applet_init_prefs (void)
G_CALLBACK (preferences_save_cb), NULL);
g_signal_connect_swapped (stickynotes->w_prefs_desktop, "toggled",
G_CALLBACK (preferences_save_cb), NULL);
+ g_signal_connect_swapped (stickynotes->w_prefs_fixed_size, "toggled",
+ G_CALLBACK (preferences_save_cb), NULL);
{
GtkSizeGroup *group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
@@ -367,6 +372,8 @@ stickynotes_applet_init_prefs (void)
gtk_widget_set_sensitive (stickynotes->w_prefs_sticky, FALSE);
if (!g_settings_is_writable (stickynotes->settings, "force-default"))
gtk_widget_set_sensitive (stickynotes->w_prefs_force, FALSE);
+ if (!g_settings_is_writable (stickynotes->settings, "fixed-size"))
+ gtk_widget_set_sensitive (stickynotes->w_prefs_fixed_size, FALSE);
stickynotes_applet_update_prefs ();
}
@@ -489,7 +496,7 @@ void
stickynotes_applet_update_prefs (void)
{
gint width, height;
- gboolean sys_color, sys_font, sticky, force_default, desktop_hide;
+ gboolean sys_color, sys_font, sticky, force_default, desktop_hide, fixed_size;
char *font_str;
char *color_str, *font_color_str;
GdkRGBA color, font_color;
@@ -511,6 +518,8 @@ stickynotes_applet_update_prefs (void)
"force-default");
desktop_hide = g_settings_get_boolean (stickynotes->settings,
"desktop-hide");
+ fixed_size = g_settings_get_boolean (stickynotes->settings,
+ "fixed-size");
font_str = g_settings_get_string (stickynotes->settings,
"default-font");
@@ -545,6 +554,9 @@ stickynotes_applet_update_prefs (void)
force_default);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (stickynotes->w_prefs_desktop),
desktop_hide);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (stickynotes->w_prefs_fixed_size),
+ fixed_size);
+ stickynotes->force_fixed_size = fixed_size;
gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (stickynotes->w_prefs_color),
&color);
diff --git a/stickynotes/stickynotes_applet.h b/stickynotes/stickynotes_applet.h
index 072318d3..e14f076f 100644
--- a/stickynotes/stickynotes_applet.h
+++ b/stickynotes/stickynotes_applet.h
@@ -50,6 +50,7 @@ typedef struct
GtkWidget *w_prefs_sticky;
GtkWidget *w_prefs_force;
GtkWidget *w_prefs_desktop;
+ GtkWidget *w_prefs_fixed_size;
GList *notes; /* Linked-List of all the sticky notes */
GList *applets; /* Linked-List of all the applets */
@@ -63,6 +64,7 @@ typedef struct
guint last_timeout_data;
gboolean visible; /* Toggle show/hide notes */
+ gboolean force_fixed_size; /* Force fixed size notes */
} StickyNotes;
/* Sticky Notes Applet */
diff --git a/stickynotes/stickynotes_applet_callbacks.c b/stickynotes/stickynotes_applet_callbacks.c
index 69869a26..4be36f0f 100644
--- a/stickynotes/stickynotes_applet_callbacks.c
+++ b/stickynotes/stickynotes_applet_callbacks.c
@@ -478,6 +478,7 @@ preferences_save_cb (gpointer data)
gboolean sticky;
gboolean force_default;
gboolean desktop_hide;
+ gboolean fixed_size;
gdouble adjustment_value;
adjustment_value = gtk_adjustment_get_value (stickynotes->w_prefs_width);
@@ -491,6 +492,7 @@ preferences_save_cb (gpointer data)
sticky = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (stickynotes->w_prefs_sticky));
force_default = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (stickynotes->w_prefs_force));
desktop_hide = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (stickynotes->w_prefs_desktop));
+ fixed_size = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (stickynotes->w_prefs_fixed_size));
if (g_settings_is_writable (stickynotes->settings,
"default-width"))
@@ -520,6 +522,10 @@ preferences_save_cb (gpointer data)
"desktop-hide"))
g_settings_set_boolean (stickynotes->settings,
"desktop-hide", desktop_hide);
+ if (g_settings_is_writable (stickynotes->settings,
+ "fixed-size"))
+ g_settings_set_boolean (stickynotes->settings,
+ "fixed-size", fixed_size);
}
/* Preferences Callback : Change color. */
@@ -626,6 +632,14 @@ preferences_apply_cb (GSettings *settings,
}
}
+ else if (!strcmp (key, "fixed-size")) {
+ gboolean fixed = g_settings_get_boolean (settings, "fixed-size");
+ for (l = stickynotes->notes; l; l = l->next) {
+ note = l->data;
+ stickynote_set_fixed_size (note, fixed);
+ }
+ }
+
stickynotes_applet_update_prefs ();
stickynotes_applet_update_menus ();
}
diff --git a/stickynotes/stickynotes_callbacks.c b/stickynotes/stickynotes_callbacks.c
index 3f22dab7..58fb53ca 100644
--- a/stickynotes/stickynotes_callbacks.c
+++ b/stickynotes/stickynotes_callbacks.c
@@ -45,6 +45,9 @@ gboolean stickynote_resize_cb (GtkWidget *widget,
GdkEventButton *event,
StickyNote *note)
{
+ if (note->force_fixed_size)
+ return FALSE;
+
if (event->type == GDK_BUTTON_PRESS && event->button == 1) {
if (widget == note->w_resize_se)
gtk_window_begin_resize_drag (GTK_WINDOW (note->w_window),
diff --git a/trashapplet/docs/tzm/tzm.po b/trashapplet/docs/tzm/tzm.po
index f59765a9..f3b6310c 100644
--- a/trashapplet/docs/tzm/tzm.po
+++ b/trashapplet/docs/tzm/tzm.po
@@ -13,7 +13,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: tzm\n"
-"Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n"
+"Plural-Forms: nplurals=2; plural=n >= 2 && (n < 11 || n > 99);\n"
#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
msgctxt "_"
generated by cgit v1.2.1 (git 2.18.0) at 2026-08-12 23:53:19 +0000