commit b8cde352eac305255e7bc0f98fb2ef679d4d8d60
parent d2e456c260a886cc294f64994e4b4fe0b3cc0452
Author: Janne Veteläinen <janne.vetelainen@elisanet.fi>
Date: Sat, 22 Jun 2024 18:45:10 +0300
Add missing static
Diffstat:
3 files changed, 33 insertions(+), 32 deletions(-)
diff --git a/systray/sndbusmenu.c b/systray/sndbusmenu.c
@@ -227,7 +227,8 @@ create_menumodel(GVariant *data, SnDbusmenu *self)
return ret;
}
-void layout_update(SnDbusmenu *self)
+static void
+layout_update(SnDbusmenu *self)
{
GError *err = NULL;
@@ -268,7 +269,7 @@ void layout_update(SnDbusmenu *self)
g_variant_unref(data);
}
-void
+static void
reschedule_update(SnItem *snitem, GParamSpec *pspec, void *data)
{
SnDbusmenu *self = SN_DBUSMENU(data);
@@ -282,7 +283,7 @@ reschedule_update(SnItem *snitem, GParamSpec *pspec, void *data)
layout_update(self);
}
-gboolean
+static gboolean
find_menuid(GMenuModel *menu, int id, GVariant *menu_data, SnDbusmenu *self)
{
gboolean ret = FALSE;
diff --git a/systray/snhost.c b/systray/snhost.c
@@ -163,7 +163,7 @@ sn_host_unregister_item(SnHost *self, SnItem *snitem)
GError *err = NULL;
g_dbus_connection_emit_signal(self->conn,
- NULL,
+ NULL,
"/StatusNotifierWatcher",
"org.kde.StatusNotifierWatcher",
"StatusNotifierItemUnregistered",
@@ -313,7 +313,7 @@ sn_host_bus_prop_get_handler(GDBusConnection* conn,
return as;
} else {
g_set_error(err,
- G_DBUS_ERROR,
+ G_DBUS_ERROR,
G_DBUS_ERROR_UNKNOWN_PROPERTY,
"Unknown property '%s'.",
property_name);
@@ -369,12 +369,12 @@ sn_host_bus_name_acquired_handler(GDBusConnection *conn, const char *busname, vo
GError *err = NULL;
g_dbus_connection_emit_signal(self->conn,
- NULL,
- "/StatusNotifierWatcher",
- "org.kde.StatusNotifierWatcher",
- "StatusNotifierHostRegistered",
- NULL,
- &err);
+ NULL,
+ "/StatusNotifierWatcher",
+ "org.kde.StatusNotifierWatcher",
+ "StatusNotifierHostRegistered",
+ NULL,
+ &err);
if (err) {
g_warning("%s", err->message);
diff --git a/systray/snitem.c b/systray/snitem.c
@@ -99,6 +99,18 @@ argb_to_rgba(int32_t width, int32_t height, unsigned char *icon_data)
}
static void
+cachedicons_free(void *data)
+{
+ CachedIcon *cicon = (CachedIcon*)data;
+ g_free(cicon->iconname);
+ if (cicon->iconpixmap)
+ g_variant_unref(cicon->iconpixmap);
+ if (cicon->icondata)
+ g_object_unref(cicon->icondata);
+ g_free(cicon);
+}
+
+static void
pixbuf_destroy(unsigned char *pixeld, void *data)
{
g_free(pixeld);
@@ -203,7 +215,7 @@ get_paintable_from_name(const char *iconname, int32_t iconsize)
return paintable;
}
-int
+static int
find_cached_name(CachedIcon *cicon, const char *name)
{
@@ -267,7 +279,7 @@ sn_item_proxy_new_iconname_handler(GObject *obj, GAsyncResult *res, void *data)
g_object_unref(self);
}
-int
+static int
find_cached_pixmap(CachedIcon *cicon, GVariant *pixmap)
{
int ret;
@@ -371,7 +383,7 @@ sn_item_proxy_signal_handler(GDBusProxy *proxy,
}
}
-void
+static void
sn_item_popup(SnItem *self)
{
g_object_set(self, "menuvisible", TRUE, NULL);
@@ -466,7 +478,7 @@ sn_item_proxy_ready_handler(GObject *obj, GAsyncResult *res, void *data)
g_object_unref(self);
}
-void
+static void
sn_item_notify_closed(GtkPopover *popover, void *data)
{
SnItem *self = SN_ITEM(data);
@@ -784,18 +796,6 @@ sn_item_dispose(GObject *obj)
}
static void
-cachedicons_free(void *data)
-{
- CachedIcon *cicon = (CachedIcon*)data;
- g_free(cicon->iconname);
- if (cicon->iconpixmap)
- g_variant_unref(cicon->iconpixmap);
- if (cicon->icondata)
- g_object_unref(cicon->icondata);
- g_free(cicon);
-}
-
-static void
sn_item_finalize(GObject *object)
{
SnItem *self = SN_ITEM(object);
@@ -851,8 +851,8 @@ sn_item_remove_all_actions(SnItem *self)
GSimpleActionGroup *actiongroup = g_simple_action_group_new();
g_object_set(self, "actiongroup", actiongroup, NULL);
gtk_widget_insert_action_group(GTK_WIDGET(self),
- "menuitem",
- G_ACTION_GROUP(self->actiongroup));
+ "menuitem",
+ G_ACTION_GROUP(self->actiongroup));
}
char*
@@ -879,8 +879,8 @@ sn_item_new(const char *busname, const char *busobj, int iconsize)
{
return g_object_new(SN_TYPE_ITEM,
"busname", busname,
- "busobj", busobj,
- "iconsize", iconsize,
- NULL);
+ "busobj", busobj,
+ "iconsize", iconsize,
+ NULL);
}
/* PUBLIC METHODS */