[gnome-panel/wip/muktupavels/api-break: 2/3] initial-setup-dialog: fix typos in function names
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-panel/wip/muktupavels/api-break: 2/3] initial-setup-dialog: fix typos in function names
- Date: Mon, 31 May 2021 11:10:19 +0000 (UTC)
commit 4e57b346ba945021099d961f1d0df8aaf1cc8ce5
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Wed May 26 15:45:55 2021 +0300
initial-setup-dialog: fix typos in function names
gnome-panel/gp-add-applet-window.c | 2 +-
gnome-panel/gp-applet-manager.c | 6 +--
gnome-panel/panel.c | 2 +-
libgnome-panel/gp-initial-setup-dialog-private.h | 20 ++++----
libgnome-panel/gp-initial-setup-dialog.c | 62 ++++++++++++------------
libgnome-panel/gp-initial-setup-dialog.h | 22 ++++-----
modules/launcher/gp-custom-launcher-applet.c | 24 ++++-----
modules/launcher/gp-launcher-applet.c | 10 ++--
modules/menu/gp-menu-module.c | 10 ++--
9 files changed, 82 insertions(+), 76 deletions(-)
---
diff --git a/gnome-panel/gp-add-applet-window.c b/gnome-panel/gp-add-applet-window.c
index 982d6d113..c4b25d5e0 100644
--- a/gnome-panel/gp-add-applet-window.c
+++ b/gnome-panel/gp-add-applet-window.c
@@ -187,7 +187,7 @@ initial_setup_dialog_cb (GpInitialSetupDialog *dialog,
data = (InitialSetupData *) user_data;
- initial_settings = gp_initital_setup_dialog_get_settings (dialog);
+ initial_settings = gp_initial_setup_dialog_get_settings (dialog);
panel_applet_frame_create (data->toplevel,
data->pack_type,
diff --git a/gnome-panel/gp-applet-manager.c b/gnome-panel/gp-applet-manager.c
index 4aeb96a18..2388c92bf 100644
--- a/gnome-panel/gp-applet-manager.c
+++ b/gnome-panel/gp-applet-manager.c
@@ -338,10 +338,10 @@ gp_applet_manager_open_initial_setup_dialog (GpAppletManager *self,
if (!info || !info->initial_setup_dialog_func)
return FALSE;
- dialog = gp_initital_setup_dialog_new ();
+ dialog = gp_initial_setup_dialog_new ();
- gp_initital_setup_dialog_add_callback (dialog, callback, user_data, free_func);
- gp_initital_setup_dialog_set_settings (dialog, settings);
+ gp_initial_setup_dialog_add_callback (dialog, callback, user_data, free_func);
+ gp_initial_setup_dialog_set_settings (dialog, settings);
info->initial_setup_dialog_func (dialog);
diff --git a/gnome-panel/panel.c b/gnome-panel/panel.c
index 29d34e2f1..82c8f51f7 100644
--- a/gnome-panel/panel.c
+++ b/gnome-panel/panel.c
@@ -405,7 +405,7 @@ initial_setup_dialog_cb (GpInitialSetupDialog *dialog,
if (canceled)
return;
- initial_settings = gp_initital_setup_dialog_get_settings (dialog);
+ initial_settings = gp_initial_setup_dialog_get_settings (dialog);
panel_applet_frame_create (data->panel->toplevel,
data->pack_type,
diff --git a/libgnome-panel/gp-initial-setup-dialog-private.h
b/libgnome-panel/gp-initial-setup-dialog-private.h
index fc603c389..9ed7ad8e3 100644
--- a/libgnome-panel/gp-initial-setup-dialog-private.h
+++ b/libgnome-panel/gp-initial-setup-dialog-private.h
@@ -26,21 +26,21 @@ typedef void (* GpInitialSetupCallback) (GpInitialSetupDialog *dialog,
gboolean canceled,
gpointer user_data);
-#define GP_TYPE_INITIAL_SETUP_DIALOG (gp_initital_setup_dialog_get_type ())
-G_DECLARE_FINAL_TYPE (GpInitialSetupDialog, gp_initital_setup_dialog,
+#define GP_TYPE_INITIAL_SETUP_DIALOG (gp_initial_setup_dialog_get_type ())
+G_DECLARE_FINAL_TYPE (GpInitialSetupDialog, gp_initial_setup_dialog,
GP, INITIAL_SETUP_DIALOG, GtkWindow)
-GpInitialSetupDialog *gp_initital_setup_dialog_new (void);
+GpInitialSetupDialog *gp_initial_setup_dialog_new (void);
-void gp_initital_setup_dialog_add_callback (GpInitialSetupDialog *dialog,
- GpInitialSetupCallback callback,
- gpointer user_data,
- GDestroyNotify free_func);
+void gp_initial_setup_dialog_add_callback (GpInitialSetupDialog *self,
+ GpInitialSetupCallback callback,
+ gpointer user_data,
+ GDestroyNotify free_func);
-GVariant *gp_initital_setup_dialog_get_settings (GpInitialSetupDialog *dialog);
+GVariant *gp_initial_setup_dialog_get_settings (GpInitialSetupDialog *self);
-void gp_initital_setup_dialog_set_settings (GpInitialSetupDialog *dialog,
- GVariant *settings);
+void gp_initial_setup_dialog_set_settings (GpInitialSetupDialog *self,
+ GVariant *settings);
G_END_DECLS
diff --git a/libgnome-panel/gp-initial-setup-dialog.c b/libgnome-panel/gp-initial-setup-dialog.c
index 7cbb01851..05ffd3695 100644
--- a/libgnome-panel/gp-initial-setup-dialog.c
+++ b/libgnome-panel/gp-initial-setup-dialog.c
@@ -46,7 +46,7 @@ enum
static guint dialog_signals[LAST_SIGNAL] = { 0 };
-G_DEFINE_TYPE (GpInitialSetupDialog, gp_initital_setup_dialog, GTK_TYPE_WINDOW)
+G_DEFINE_TYPE (GpInitialSetupDialog, gp_initial_setup_dialog, GTK_TYPE_WINDOW)
static void
cancel_clicked_cb (GtkButton *button,
@@ -76,7 +76,7 @@ close_cb (GpInitialSetupDialog *self,
}
static void
-gp_initital_setup_dialog_finalize (GObject *object)
+gp_initial_setup_dialog_finalize (GObject *object)
{
GpInitialSetupDialog *dialog;
@@ -100,12 +100,12 @@ gp_initital_setup_dialog_finalize (GObject *object)
g_clear_pointer (&dialog->settings, g_hash_table_destroy);
- G_OBJECT_CLASS (gp_initital_setup_dialog_parent_class)->finalize (object);
+ G_OBJECT_CLASS (gp_initial_setup_dialog_parent_class)->finalize (object);
}
static gboolean
-gp_initital_setup_dialog_delete_event (GtkWidget *widget,
- GdkEventAny *event)
+gp_initial_setup_dialog_delete_event (GtkWidget *widget,
+ GdkEventAny *event)
{
GpInitialSetupDialog *dialog;
@@ -133,7 +133,7 @@ install_signals (void)
}
static void
-gp_initital_setup_dialog_class_init (GpInitialSetupDialogClass *dialog_class)
+gp_initial_setup_dialog_class_init (GpInitialSetupDialogClass *dialog_class)
{
GObjectClass *object_class;
GtkWidgetClass *widget_class;
@@ -142,9 +142,9 @@ gp_initital_setup_dialog_class_init (GpInitialSetupDialogClass *dialog_class)
object_class = G_OBJECT_CLASS (dialog_class);
widget_class = GTK_WIDGET_CLASS (dialog_class);
- object_class->finalize = gp_initital_setup_dialog_finalize;
+ object_class->finalize = gp_initial_setup_dialog_finalize;
- widget_class->delete_event = gp_initital_setup_dialog_delete_event;
+ widget_class->delete_event = gp_initial_setup_dialog_delete_event;
install_signals ();
@@ -153,7 +153,7 @@ gp_initital_setup_dialog_class_init (GpInitialSetupDialogClass *dialog_class)
}
static void
-gp_initital_setup_dialog_init (GpInitialSetupDialog *dialog)
+gp_initial_setup_dialog_init (GpInitialSetupDialog *dialog)
{
GtkWidget *header_bar;
GtkWidget *cancel;
@@ -187,16 +187,16 @@ gp_initital_setup_dialog_init (GpInitialSetupDialog *dialog)
}
GpInitialSetupDialog *
-gp_initital_setup_dialog_new (void)
+gp_initial_setup_dialog_new (void)
{
return g_object_new (GP_TYPE_INITIAL_SETUP_DIALOG, NULL);
}
void
-gp_initital_setup_dialog_add_callback (GpInitialSetupDialog *dialog,
- GpInitialSetupCallback callback,
- gpointer user_data,
- GDestroyNotify free_func)
+gp_initial_setup_dialog_add_callback (GpInitialSetupDialog *dialog,
+ GpInitialSetupCallback callback,
+ gpointer user_data,
+ GDestroyNotify free_func)
{
dialog->setup_callback = callback;
dialog->setup_user_data = user_data;
@@ -204,10 +204,10 @@ gp_initital_setup_dialog_add_callback (GpInitialSetupDialog *dialog,
}
void
-gp_initital_setup_dialog_add_content_widget (GpInitialSetupDialog *dialog,
- GtkWidget *content,
- gpointer user_data,
- GDestroyNotify free_func)
+gp_initial_setup_dialog_add_content_widget (GpInitialSetupDialog *dialog,
+ GtkWidget *content,
+ gpointer user_data,
+ GDestroyNotify free_func)
{
dialog->content_user_data = user_data;
dialog->content_user_data_free_func = free_func;
@@ -218,7 +218,7 @@ gp_initital_setup_dialog_add_content_widget (GpInitialSetupDialog *dialog,
}
/**
- * gp_initital_setup_dialog_get_setting:
+ * gp_initial_setup_dialog_get_setting:
* @dialog: a #GpInitialSetupDialog
* @key: the setting key
*
@@ -227,14 +227,14 @@ gp_initital_setup_dialog_add_content_widget (GpInitialSetupDialog *dialog,
* Returns: (transfer none): a #GVariant, or %NULL.
*/
GVariant *
-gp_initital_setup_dialog_get_setting (GpInitialSetupDialog *dialog,
- const char *key)
+gp_initial_setup_dialog_get_setting (GpInitialSetupDialog *dialog,
+ const char *key)
{
return g_hash_table_lookup (dialog->settings, key);
}
/**
- * gp_initital_setup_dialog_set_setting:
+ * gp_initial_setup_dialog_set_setting:
* @dialog: a #GpInitialSetupDialog
* @key: the setting key
* @value: (allow-none): the setting value, or %NULL to unset the setting
@@ -245,9 +245,9 @@ gp_initital_setup_dialog_get_setting (GpInitialSetupDialog *dialog,
* If @value is floating, it is consumed.
*/
void
-gp_initital_setup_dialog_set_setting (GpInitialSetupDialog *dialog,
- const gchar *key,
- GVariant *value)
+gp_initial_setup_dialog_set_setting (GpInitialSetupDialog *dialog,
+ const char *key,
+ GVariant *value)
{
if (value != NULL)
{
@@ -261,7 +261,7 @@ gp_initital_setup_dialog_set_setting (GpInitialSetupDialog *dialog,
}
GVariant *
-gp_initital_setup_dialog_get_settings (GpInitialSetupDialog *dialog)
+gp_initial_setup_dialog_get_settings (GpInitialSetupDialog *dialog)
{
GVariantBuilder builder;
GHashTableIter iter;
@@ -281,8 +281,8 @@ gp_initital_setup_dialog_get_settings (GpInitialSetupDialog *dialog)
}
void
-gp_initital_setup_dialog_set_settings (GpInitialSetupDialog *dialog,
- GVariant *settings)
+gp_initial_setup_dialog_set_settings (GpInitialSetupDialog *dialog,
+ GVariant *settings)
{
GVariantIter iter;
char *key;
@@ -294,7 +294,7 @@ gp_initital_setup_dialog_set_settings (GpInitialSetupDialog *dialog,
g_variant_iter_init (&iter, settings);
while (g_variant_iter_next (&iter, "{sv}", &key, &value))
{
- gp_initital_setup_dialog_set_setting (dialog, key, value);
+ gp_initial_setup_dialog_set_setting (dialog, key, value);
g_free (key);
g_variant_unref (value);
@@ -302,8 +302,8 @@ gp_initital_setup_dialog_set_settings (GpInitialSetupDialog *dialog,
}
void
-gp_initital_setup_dialog_set_done (GpInitialSetupDialog *dialog,
- gboolean done)
+gp_initial_setup_dialog_set_done (GpInitialSetupDialog *dialog,
+ gboolean done)
{
gtk_widget_set_sensitive (dialog->done, done);
}
diff --git a/libgnome-panel/gp-initial-setup-dialog.h b/libgnome-panel/gp-initial-setup-dialog.h
index 217de46ea..8b1ac300b 100644
--- a/libgnome-panel/gp-initial-setup-dialog.h
+++ b/libgnome-panel/gp-initial-setup-dialog.h
@@ -29,20 +29,20 @@ G_BEGIN_DECLS
*/
typedef struct _GpInitialSetupDialog GpInitialSetupDialog;
-void gp_initital_setup_dialog_add_content_widget (GpInitialSetupDialog *dialog,
- GtkWidget *content,
- gpointer user_data,
- GDestroyNotify free_func);
+void gp_initial_setup_dialog_add_content_widget (GpInitialSetupDialog *self,
+ GtkWidget *content,
+ gpointer user_data,
+ GDestroyNotify free_func);
-GVariant *gp_initital_setup_dialog_get_setting (GpInitialSetupDialog *dialog,
- const char *key);
+GVariant *gp_initial_setup_dialog_get_setting (GpInitialSetupDialog *self,
+ const char *key);
-void gp_initital_setup_dialog_set_setting (GpInitialSetupDialog *dialog,
- const gchar *key,
- GVariant *value);
+void gp_initial_setup_dialog_set_setting (GpInitialSetupDialog *self,
+ const char *key,
+ GVariant *value);
-void gp_initital_setup_dialog_set_done (GpInitialSetupDialog *dialog,
- gboolean done);
+void gp_initial_setup_dialog_set_done (GpInitialSetupDialog *self,
+ gboolean done);
G_END_DECLS
diff --git a/modules/launcher/gp-custom-launcher-applet.c b/modules/launcher/gp-custom-launcher-applet.c
index d29724686..69e007817 100644
--- a/modules/launcher/gp-custom-launcher-applet.c
+++ b/modules/launcher/gp-custom-launcher-applet.c
@@ -85,7 +85,7 @@ check_required_info (LauncherData *data)
gp_editor_get_comment (data->editor),
NULL);
- gp_initital_setup_dialog_set_done (data->dialog, done);
+ gp_initial_setup_dialog_set_done (data->dialog, done);
}
static void
@@ -97,7 +97,7 @@ icon_changed_cb (GpEditor *editor,
icon = gp_editor_get_icon (editor);
variant = icon != NULL ? g_variant_new_string (icon) : NULL;
- gp_initital_setup_dialog_set_setting (data->dialog, "icon", variant);
+ gp_initial_setup_dialog_set_setting (data->dialog, "icon", variant);
check_required_info (data);
}
@@ -125,16 +125,16 @@ type_changed_cb (GpEditor *editor,
}
variant = type_string != NULL ? g_variant_new_string (type_string) : NULL;
- gp_initital_setup_dialog_set_setting (data->dialog, "type", variant);
+ gp_initial_setup_dialog_set_setting (data->dialog, "type", variant);
if (type == GP_EDITOR_TYPE_TERMINAL_APPLICATION)
{
variant = g_variant_new_boolean (TRUE);
- gp_initital_setup_dialog_set_setting (data->dialog, "terminal", variant);
+ gp_initial_setup_dialog_set_setting (data->dialog, "terminal", variant);
}
else
{
- gp_initital_setup_dialog_set_setting (data->dialog, "terminal", NULL);
+ gp_initial_setup_dialog_set_setting (data->dialog, "terminal", NULL);
}
check_required_info (data);
@@ -149,7 +149,7 @@ name_changed_cb (GpEditor *editor,
name = gp_editor_get_name (editor);
variant = name != NULL ? g_variant_new_string (name) : NULL;
- gp_initital_setup_dialog_set_setting (data->dialog, "name", variant);
+ gp_initial_setup_dialog_set_setting (data->dialog, "name", variant);
check_required_info (data);
}
@@ -163,7 +163,7 @@ command_changed_cb (GpEditor *editor,
command = gp_editor_get_command (editor);
variant = command != NULL ? g_variant_new_string (command) : NULL;
- gp_initital_setup_dialog_set_setting (data->dialog, "command", variant);
+ gp_initial_setup_dialog_set_setting (data->dialog, "command", variant);
check_required_info (data);
}
@@ -177,7 +177,7 @@ comment_changed_cb (GpEditor *editor,
comment = gp_editor_get_comment (editor);
variant = comment != NULL ? g_variant_new_string (comment) : NULL;
- gp_initital_setup_dialog_set_setting (data->dialog, "comment", variant);
+ gp_initial_setup_dialog_set_setting (data->dialog, "comment", variant);
check_required_info (data);
}
@@ -221,7 +221,7 @@ gp_custom_launcher_applet_initial_setup_dialog (GpInitialSetupDialog *dialog)
g_signal_connect (editor, "command-changed", G_CALLBACK (command_changed_cb), data);
g_signal_connect (editor, "comment-changed", G_CALLBACK (comment_changed_cb), data);
- variant = gp_initital_setup_dialog_get_setting (dialog, "command");
+ variant = gp_initial_setup_dialog_get_setting (dialog, "command");
if (variant != NULL)
{
gp_editor_set_command (GP_EDITOR (editor),
@@ -231,6 +231,8 @@ gp_custom_launcher_applet_initial_setup_dialog (GpInitialSetupDialog *dialog)
icon_changed_cb (data->editor, data);
type_changed_cb (data->editor, data);
- gp_initital_setup_dialog_add_content_widget (dialog, editor, data,
- launcher_data_free);
+ gp_initial_setup_dialog_add_content_widget (dialog,
+ editor,
+ data,
+ launcher_data_free);
}
diff --git a/modules/launcher/gp-launcher-applet.c b/modules/launcher/gp-launcher-applet.c
index 553ff7b7c..6a1e9dad1 100644
--- a/modules/launcher/gp-launcher-applet.c
+++ b/modules/launcher/gp-launcher-applet.c
@@ -368,12 +368,12 @@ selection_changed_cb (GtkTreeSelection *selection,
variant = g_variant_new_string (app_data->path);
- gp_initital_setup_dialog_set_setting (data->dialog, "location", variant);
+ gp_initial_setup_dialog_set_setting (data->dialog, "location", variant);
done = TRUE;
}
}
- gp_initital_setup_dialog_set_done (data->dialog, done);
+ gp_initial_setup_dialog_set_done (data->dialog, done);
}
static gboolean
@@ -1570,6 +1570,8 @@ gp_launcher_applet_initial_setup_dialog (GpInitialSetupDialog *dialog)
gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view),
GTK_TREE_MODEL (data->store));
- gp_initital_setup_dialog_add_content_widget (dialog, scrolled, data,
- launcher_data_free);
+ gp_initial_setup_dialog_add_content_widget (dialog,
+ scrolled,
+ data,
+ launcher_data_free);
}
diff --git a/modules/menu/gp-menu-module.c b/modules/menu/gp-menu-module.c
index 38d04b8b0..93b54ef73 100644
--- a/modules/menu/gp-menu-module.c
+++ b/modules/menu/gp-menu-module.c
@@ -289,12 +289,12 @@ selection_changed_cb (GtkTreeSelection *selection,
variant = g_variant_new_string (menu_path);
g_free (menu_path);
- gp_initital_setup_dialog_set_setting (data->dialog, "menu-path", variant);
+ gp_initial_setup_dialog_set_setting (data->dialog, "menu-path", variant);
done = TRUE;
}
}
- gp_initital_setup_dialog_set_done (data->dialog, done);
+ gp_initial_setup_dialog_set_done (data->dialog, done);
}
static void
@@ -353,8 +353,10 @@ menu_button_initial_setup_dialog (GpInitialSetupDialog *dialog)
gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view),
GTK_TREE_MODEL (data->store));
- gp_initital_setup_dialog_add_content_widget (dialog, scrolled, data,
- menu_button_data_free);
+ gp_initial_setup_dialog_add_content_widget (dialog,
+ scrolled,
+ data,
+ menu_button_data_free);
}
static GpAppletInfo *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
