This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch master
in repository e16-keyedit.
View the commit online.
commit 6c8d057b8b83a44f794bed324d51f1482f139d19
Author: Kim Woelders <k...@woelders.dk>
AuthorDate: Fri Dec 8 09:39:35 2023 +0100
Use regular types (not gchar etc.)
Just annoying, IMO.
---
e16keyedit.h | 4 ++--
ipc.c | 48 ++++++++++++++++++++++++------------------------
menus.c | 2 +-
viewer.c | 52 ++++++++++++++++++++++++++--------------------------
4 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/e16keyedit.h b/e16keyedit.h
index 3938a46..b916d8e 100644
--- a/e16keyedit.h
+++ b/e16keyedit.h
@@ -23,8 +23,8 @@
#endif
/* ipc.c */
-extern gint CommsInit(void (*msg_receive_func)(gchar * msg));
-extern void CommsSend(const gchar * s);
+extern int CommsInit(void (*msg_receive_func)(char *msg));
+extern void CommsSend(const char *s);
/* menus.c */
extern GtkWidget *CreateBarSubMenu(GtkWidget * menu, const char *szName);
diff --git a/ipc.c b/ipc.c
index fe08831..fc2c6b4 100644
--- a/ipc.c
+++ b/ipc.c
@@ -13,16 +13,16 @@
gdk_x11_window_foreign_new_for_display(gdk_display_get_default(), xwin)
typedef struct _client {
- gchar *name;
+ char *name;
Window win;
- gchar *msg;
- gchar *clientname;
- gchar *version;
- gchar *author;
- gchar *email;
- gchar *web;
- gchar *address;
- gchar *info;
+ char *msg;
+ char *clientname;
+ char *version;
+ char *author;
+ char *email;
+ char *web;
+ char *address;
+ char *info;
} Client;
Client *e_client = NULL;
@@ -32,22 +32,22 @@ static Window comms_win = None;
static Window my_win = None;
static GdkWindow *gdkwin = NULL;
static GdkWindow *gdkwin2 = NULL;
-static void (*msg_receive_callback)(gchar * msg) = NULL;
+static void (*msg_receive_callback)(char *msg) = NULL;
static void CommsSetup(void);
static GdkFilterReturn CommsFilter(GdkXEvent * gdk_xevent, GdkEvent * event,
- gpointer data);
+ void *data);
static Window CommsFindCommsWindow(void);
-static gchar *CommsGet(Client ** c, XEvent * ev);
+static char *CommsGet(Client ** c, XEvent * ev);
static Client *MakeClient(Window win);
static void ListFreeClient(void *ptr);
-static gchar in_init = 0;
+static char in_init = 0;
-gint
-CommsInit(void (*msg_receive_func)(gchar *msg))
+int
+CommsInit(void (*msg_receive_func)(char *msg))
{
Window win;
- gchar st[32];
+ char st[32];
Client *cl;
CommsSetup();
@@ -70,9 +70,9 @@ CommsInit(void (*msg_receive_func)(gchar *msg))
}
void
-CommsSend(const gchar *s)
+CommsSend(const char *s)
{
- gchar ss[21];
+ char ss[21];
int i, j, k, len;
XEvent ev;
static Atom a = 0;
@@ -113,10 +113,10 @@ CommsSend(const gchar *s)
static GdkFilterReturn
CommsFilter(GdkXEvent *gdk_xevent, GdkEvent *event __UNUSED__,
- gpointer data __UNUSED__)
+ void *data __UNUSED__)
{
XEvent *xevent;
- gchar *msg = NULL;
+ char *msg = NULL;
Client *c = NULL;
static Atom a;
@@ -131,7 +131,7 @@ CommsFilter(GdkXEvent *gdk_xevent, GdkEvent *event __UNUSED__,
case DestroyNotify:
if (xevent->xdestroywindow.window == comms_win)
{
- gint i;
+ int i;
comms_win = 0;
if (!in_init)
@@ -140,7 +140,7 @@ CommsFilter(GdkXEvent *gdk_xevent, GdkEvent *event __UNUSED__,
{
if ((comms_win = CommsFindCommsWindow()))
{
- gchar st[256];
+ char st[256];
ListFreeClient(e_client);
e_client = MakeClient(comms_win);
@@ -270,10 +270,10 @@ CommsFindCommsWindow(void)
return win;
}
-static gchar *
+static char *
CommsGet(Client **c, XEvent *ev)
{
- gchar s[13], s2[9], *msg;
+ char s[13], s2[9], *msg;
int i;
Window win;
Client *cl;
diff --git a/menus.c b/menus.c
index 9a1d4b9..1253823 100644
--- a/menus.c
+++ b/menus.c
@@ -51,7 +51,7 @@ CreateMenuItem(GtkWidget *menu, const char *szName, const char *szAccel,
menuitem = gtk_menu_item_new_with_label(szName);
if (func)
g_signal_connect(G_OBJECT(menuitem), "activate", func,
- (gpointer) data);
+ (void *)data);
}
else
{
diff --git a/viewer.c b/viewer.c
index f92fb57..05b343a 100644
--- a/viewer.c
+++ b/viewer.c
@@ -29,7 +29,7 @@ static GtkWidget *act_params;
static GtkWidget *act_mod;
static GtkWidget *act_clist;
-static gchar *e_ipc_msg = NULL;
+static char *e_ipc_msg = NULL;
static char dont_update = 0;
static int last_row = 0;
static int real_rows = 0;
@@ -41,7 +41,7 @@ typedef struct {
typedef struct {
const char *text;
- gchar param_tpe;
+ char param_tpe;
const char *params;
const char *command;
} ActionOpt;
@@ -281,7 +281,7 @@ on_popup_clicked(GtkWidget *win, GdkEventKey *ev)
}
static void
-on_popup_mapped(GtkWidget *win, gpointer data __UNUSED__)
+on_popup_mapped(GtkWidget *win, void *data __UNUSED__)
{
#if USE_GTK == 2
gdk_keyboard_grab(gtk_widget_get_window(win), FALSE, GDK_CURRENT_TIME);
@@ -293,7 +293,7 @@ on_popup_mapped(GtkWidget *win, gpointer data __UNUSED__)
}
static void
-e_cb_key_change(GtkWidget *widget __UNUSED__, gpointer data __UNUSED__)
+e_cb_key_change(GtkWidget *widget __UNUSED__, void *data __UNUSED__)
{
GtkWidget *win, *frame, *vbox, *label;
@@ -317,7 +317,7 @@ e_cb_key_change(GtkWidget *widget __UNUSED__, gpointer data __UNUSED__)
}
static void
-e_cb_modifier(GtkWidget *widget, gpointer data __UNUSED__)
+e_cb_modifier(GtkWidget *widget, void *data __UNUSED__)
{
int i;
@@ -328,7 +328,7 @@ e_cb_modifier(GtkWidget *widget, gpointer data __UNUSED__)
clist_row_current_set_value(clist, 0, MOD_TEXT(i));
}
-static gchar *
+static char *
wait_for_ipc_msg(void)
{
e_ipc_msg = NULL;
@@ -343,11 +343,11 @@ wait_for_ipc_msg(void)
#if USE_GTK_TREEVIEW
static void
-change_action(GtkTreeSelection *sel, gpointer data __UNUSED__)
+change_action(GtkTreeSelection *sel, void *data __UNUSED__)
#else
static void
-change_action(GtkWidget *my_clist __UNUSED__, gint row, gint column __UNUSED__,
- GdkEventButton *event __UNUSED__, gpointer data __UNUSED__)
+change_action(GtkWidget *my_clist __UNUSED__, int row, int column __UNUSED__,
+ GdkEventButton *event __UNUSED__, void *data __UNUSED__)
#endif
{
int k;
@@ -418,7 +418,7 @@ on_save_data(void)
#if USE_GTK_TREEVIEW
GtkTreeModel *model;
GtkTreeIter iter;
- gboolean ok;
+ int ok;
model = gtk_tree_view_get_model(GTK_TREE_VIEW(clist));
for (ok = gtk_tree_model_get_iter_first(model, &iter); ok;
@@ -466,15 +466,15 @@ on_save_data(void)
#if USE_GTK_TREEVIEW
static void
-selection_made(GtkTreeSelection *sel, gpointer data __UNUSED__)
+selection_made(GtkTreeSelection *sel, void *data __UNUSED__)
#else
static void
-selection_made(GtkWidget *my_clist __UNUSED__, gint row,
- gint column __UNUSED__, GdkEventButton *event __UNUSED__,
- gpointer data __UNUSED__)
+selection_made(GtkWidget *my_clist __UNUSED__, int row,
+ int column __UNUSED__, GdkEventButton *event __UNUSED__,
+ void *data __UNUSED__)
#endif
{
- gchar *mod, *key, *act, *prm;
+ char *mod, *key, *act, *prm;
int i;
#if USE_GTK_TREEVIEW
@@ -544,13 +544,13 @@ selection_made(GtkWidget *my_clist __UNUSED__, gint row,
dont_update = 0;
}
-static gchar *get_line(gchar * str, int num);
+static char *get_line(char *str, int num);
-static gchar *
-get_line(gchar *str, int num)
+static char *
+get_line(char *str, int num)
{
- gchar *s1, *s2, *s;
- gint i, count, l;
+ char *s1, *s2, *s;
+ int i, count, l;
i = 0;
count = 0;
@@ -581,8 +581,8 @@ get_line(gchar *str, int num)
#if ENABLE_SORTING
static void
-on_resort_columns(GtkWidget *widget __UNUSED__, gint column,
- gpointer data __UNUSED__)
+on_resort_columns(GtkWidget *widget __UNUSED__, int column,
+ void *data __UNUSED__)
{
static int order = 0;
static int last_col = 0;
@@ -613,7 +613,7 @@ on_resort_columns(GtkWidget *widget __UNUSED__, gint column,
#endif /* ENABLE_SORTING */
static void
-on_delete_row(GtkWidget *widget __UNUSED__, gpointer data __UNUSED__)
+on_delete_row(GtkWidget *widget __UNUSED__, void *data __UNUSED__)
{
#if USE_GTK_TREEVIEW
GtkTreeSelection *sel;
@@ -635,7 +635,7 @@ on_delete_row(GtkWidget *widget __UNUSED__, gpointer data __UNUSED__)
}
static void
-on_create_row(GtkWidget *widget __UNUSED__, gpointer data __UNUSED__)
+on_create_row(GtkWidget *widget __UNUSED__, void *data __UNUSED__)
{
#if USE_GTK_TREEVIEW
GtkTreeModel *model;
@@ -661,7 +661,7 @@ on_create_row(GtkWidget *widget __UNUSED__, gpointer data __UNUSED__)
}
static void
-on_change_params(GtkWidget *widget, gpointer data __UNUSED__)
+on_change_params(GtkWidget *widget, void *data __UNUSED__)
{
const char *txt;
@@ -1051,7 +1051,7 @@ create_list_window(void)
}
static void
-receive_ipc_msg(gchar *msg)
+receive_ipc_msg(char *msg)
{
e_ipc_msg = g_strdup(msg);
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
