[gedit] StatusMenuButton: minor code changes
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit] StatusMenuButton: minor code changes
- Date: Wed, 25 Nov 2020 16:32:30 +0000 (UTC)
commit 3af372ab359a9cc8055ef4c1c4e27d330ecdb7f9
Author: Sébastien Wilmet <swilmet gnome org>
Date: Wed Nov 25 17:29:46 2020 +0100
StatusMenuButton: minor code changes
gedit/gedit-status-menu-button.c | 65 ++++++++++++++++++++--------------------
gedit/gedit-status-menu-button.h | 13 ++++----
2 files changed, 39 insertions(+), 39 deletions(-)
---
diff --git a/gedit/gedit-status-menu-button.c b/gedit/gedit-status-menu-button.c
index 3f46a489f..8ba6cf5fd 100644
--- a/gedit/gedit-status-menu-button.c
+++ b/gedit/gedit-status-menu-button.c
@@ -1,5 +1,4 @@
/*
- * gedit-status-menu-button.c
* This file is part of gedit
*
* Copyright (C) 2008 - Jesse van den Kieboom
@@ -24,19 +23,18 @@ struct _GeditStatusMenuButton
{
GtkMenuButton parent_instance;
- GtkWidget *label;
+ GtkLabel *label;
};
typedef struct
{
- GtkCssProvider *css;
+ GtkCssProvider *css_provider;
} GeditStatusMenuButtonClassPrivate;
enum
{
PROP_0,
- PROP_LABEL,
- LAST_PROP
+ PROP_LABEL
};
G_DEFINE_TYPE_WITH_CODE (GeditStatusMenuButton,
@@ -50,13 +48,14 @@ gedit_status_menu_button_get_property (GObject *object,
GValue *value,
GParamSpec *pspec)
{
- GeditStatusMenuButton *obj = GEDIT_STATUS_MENU_BUTTON (object);
+ GeditStatusMenuButton *button = GEDIT_STATUS_MENU_BUTTON (object);
switch (prop_id)
{
case PROP_LABEL:
- g_value_set_string (value, gedit_status_menu_button_get_label (obj));
+ g_value_set_string (value, gedit_status_menu_button_get_label (button));
break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -69,13 +68,14 @@ gedit_status_menu_button_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec)
{
- GeditStatusMenuButton *obj = GEDIT_STATUS_MENU_BUTTON (object);
+ GeditStatusMenuButton *button = GEDIT_STATUS_MENU_BUTTON (object);
switch (prop_id)
{
case PROP_LABEL:
- gedit_status_menu_button_set_label (obj, g_value_get_string (value));
+ gedit_status_menu_button_set_label (button, g_value_get_string (value));
break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -85,17 +85,17 @@ gedit_status_menu_button_set_property (GObject *object,
static void
gedit_status_menu_button_class_init (GeditStatusMenuButtonClass *klass)
{
- static const gchar style[] =
- "* {\n"
- "padding: 1px 8px 2px 4px;\n"
- "border: 0;\n"
- "outline-width: 0;\n"
- "}";
-
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
GeditStatusMenuButtonClassPrivate *class_priv;
+ static const gchar style[] =
+ "* {\n"
+ " padding: 1px 8px 2px 4px;\n"
+ " border: 0;\n"
+ " outline-width: 0;\n"
+ "}\n";
+
object_class->get_property = gedit_status_menu_button_get_property;
object_class->set_property = gedit_status_menu_button_set_property;
@@ -106,42 +106,41 @@ gedit_status_menu_button_class_init (GeditStatusMenuButtonClass *klass)
"/org/gnome/gedit/ui/gedit-status-menu-button.ui");
gtk_widget_class_bind_template_child_internal (widget_class, GeditStatusMenuButton, label);
- /* Store the CSS provider in the class private data so it is shared among all instances */
+ /* Store the CSS provider in the class private data so it is shared
+ * among all instances.
+ */
class_priv = G_TYPE_CLASS_GET_PRIVATE (klass, GEDIT_TYPE_STATUS_MENU_BUTTON,
GeditStatusMenuButtonClassPrivate);
- class_priv->css = gtk_css_provider_new ();
- gtk_css_provider_load_from_data (class_priv->css, style, -1, NULL);
+ class_priv->css_provider = gtk_css_provider_new ();
+ gtk_css_provider_load_from_data (class_priv->css_provider, style, -1, NULL);
}
static void
-gedit_status_menu_button_init (GeditStatusMenuButton *self)
+gedit_status_menu_button_init (GeditStatusMenuButton *button)
{
GtkStyleContext *context;
GeditStatusMenuButtonClassPrivate *class_priv;
- gtk_widget_init_template (GTK_WIDGET (self));
+ gtk_widget_init_template (GTK_WIDGET (button));
- /* make it as small as possible */
- context = gtk_widget_get_style_context (GTK_WIDGET (self));
- class_priv = G_TYPE_CLASS_GET_PRIVATE (G_TYPE_INSTANCE_GET_CLASS (self,
GEDIT_TYPE_STATUS_MENU_BUTTON, GeditStatusMenuButtonClass),
+ /* Make it as small as possible. */
+ context = gtk_widget_get_style_context (GTK_WIDGET (button));
+ class_priv = G_TYPE_CLASS_GET_PRIVATE (G_TYPE_INSTANCE_GET_CLASS (button,
GEDIT_TYPE_STATUS_MENU_BUTTON, GeditStatusMenuButtonClass),
GEDIT_TYPE_STATUS_MENU_BUTTON,
GeditStatusMenuButtonClassPrivate);
gtk_style_context_add_provider (context,
- GTK_STYLE_PROVIDER (class_priv->css),
+ GTK_STYLE_PROVIDER (class_priv->css_provider),
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
}
-/**
- * gedit_status_menu_button_new:
- * @label: (allow-none):
- */
GtkWidget *
gedit_status_menu_button_new (void)
{
return g_object_new (GEDIT_TYPE_STATUS_MENU_BUTTON, NULL);
}
-/* we cannot rely on gtk_button_set_label since it manually replaces
- * the internal child instead of just setting the property :( */
+/* We cannot rely on gtk_button_set_label() since it manually replaces the
+ * internal child instead of just setting the property :(
+ */
void
gedit_status_menu_button_set_label (GeditStatusMenuButton *button,
@@ -149,7 +148,7 @@ gedit_status_menu_button_set_label (GeditStatusMenuButton *button,
{
g_return_if_fail (GEDIT_IS_STATUS_MENU_BUTTON (button));
- gtk_label_set_markup (GTK_LABEL (button->label), label);
+ gtk_label_set_markup (button->label, label);
}
const gchar *
@@ -157,7 +156,7 @@ gedit_status_menu_button_get_label (GeditStatusMenuButton *button)
{
g_return_val_if_fail (GEDIT_IS_STATUS_MENU_BUTTON (button), NULL);
- return gtk_label_get_label (GTK_LABEL (button->label));
+ return gtk_label_get_label (button->label);
}
/* ex:set ts=8 noet: */
diff --git a/gedit/gedit-status-menu-button.h b/gedit/gedit-status-menu-button.h
index baeaa5323..1e19a0bac 100644
--- a/gedit/gedit-status-menu-button.h
+++ b/gedit/gedit-status-menu-button.h
@@ -1,5 +1,4 @@
/*
- * gedit-status-menu-button.h
* This file is part of gedit
*
* Copyright (C) 2008 - Jesse van den Kieboom
@@ -27,14 +26,16 @@ G_BEGIN_DECLS
#define GEDIT_TYPE_STATUS_MENU_BUTTON (gedit_status_menu_button_get_type ())
-G_DECLARE_FINAL_TYPE (GeditStatusMenuButton, gedit_status_menu_button, GEDIT, STATUS_MENU_BUTTON,
GtkMenuButton)
+G_DECLARE_FINAL_TYPE (GeditStatusMenuButton, gedit_status_menu_button,
+ GEDIT, STATUS_MENU_BUTTON,
+ GtkMenuButton)
-GtkWidget *gedit_status_menu_button_new (void);
+GtkWidget * gedit_status_menu_button_new (void);
-void gedit_status_menu_button_set_label (GeditStatusMenuButton *button,
- const gchar *label);
+void gedit_status_menu_button_set_label (GeditStatusMenuButton *button,
+ const gchar *label);
-const gchar *gedit_status_menu_button_get_label (GeditStatusMenuButton *button);
+const gchar * gedit_status_menu_button_get_label (GeditStatusMenuButton *button);
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]