lbxgui: Clean up function names and linkage.

diff --git a/src/gui/lbxgui.c b/src/gui/lbxgui.c
index 2cceca3e60e4d78f5a41e786930c60a82f28030b..f32eee56f6cce29f60fe46346ccc1434f423c4f3 100644 (file)
--- a/src/gui/lbxgui.c
+++ b/src/gui/lbxgui.c
@@ -22,7 +22,7 @@ static struct lbx_colour palette_external[256];
 static struct lbx_colour palette_internal[256];
 static struct lbx_colour palette_override[256];
 
-GdkPixbuf *framebuf;
+static GdkPixbuf *framebuf;
 
 void play_toggled(GtkToggleButton *button, gpointer data)
 {
@@ -214,7 +214,7 @@ static int img_close(void *handle)
        return 0;
 }
 
-void set_override_data(GtkComboBox *combo)
+void set_override(GtkComboBox *combo)
 {
        GtkTreeIter iter;
        gpointer lbx;
@@ -247,7 +247,7 @@ void set_override_data(GtkComboBox *combo)
        }
 }
 
-void set_palette_data(GtkComboBox *combo)
+void set_palette(GtkComboBox *combo)
 {
        GtkTreeIter iter;
        gpointer lbx;
@@ -273,7 +273,7 @@ void set_palette_data(GtkComboBox *combo)
        init_framedata(0);
 }
 
-void set_image_data(GtkComboBox *combo)
+void set_image(GtkComboBox *combo)
 {
        GtkTreeIter iter;
        gpointer lbx;
@@ -327,7 +327,7 @@ void show_about(GtkWidget *widget)
                NULL);
 }
 
-int load_archive(const char *path)
+static int load_archive(const char *path)
 {
        gchar *basename;
        GtkTreeIter iter1, iter2;
@@ -362,7 +362,7 @@ int load_archive(const char *path)
        return 0;
 }
 
-void load_error(const char *name, GtkWindow *window)
+static void load_error(const char *name, GtkWindow *window)
 {
        GtkWidget *dialog;
 
@@ -444,7 +444,7 @@ static void init_combobox(GtkBuilder *builder, const char *name)
                GTK_STOCK_CLEAR);
 }
 
-static void interface_init(void)
+static void init_interface(void)
 {
        GtkTreeViewColumn *column;
        GtkCellRenderer *renderer;
@@ -464,7 +464,7 @@ static void interface_init(void)
        init_combobox(builder, "overchooser");
 }
 
-GdkBitmap *init_bg(GdkDrawable *drawable, GdkGC *gc)
+static GdkBitmap *init_background(GdkDrawable *drawable, GdkGC *gc)
 {
        GdkColor fg = { .red = 0x6666, .green = 0x6666, .blue = 0x6666 };
        GdkColor bg = { .red = 0x9999, .green = 0x9999, .blue = 0x9999 };
@@ -505,13 +505,13 @@ int main(int argc, char **argv)
        window = GTK_WIDGET(gtk_builder_get_object(builder, "mainwindow"));
        canvas = GTK_WIDGET(gtk_builder_get_object(builder, "canvas"));
 
-       interface_init();
+       init_interface();
        gtk_builder_connect_signals(builder, window);
 
        g_timeout_add(10, timeout, NULL);
        gtk_widget_show_all(window);
 
        bg_gc = gdk_gc_new(canvas->window);
-       init_bg(canvas->window, bg_gc);
+       init_background(canvas->window, bg_gc);
        gtk_main();
 }

diff --git a/src/gui/lbxgui.glade b/src/gui/lbxgui.glade
index e8bf6768b14c69bfdaf29e41f58e729a42b206d4..b925daafa221620f5eda0baa25e3a87c225b80f4 100644 (file)
--- a/src/gui/lbxgui.glade
+++ b/src/gui/lbxgui.glade
@@ -137,7 +137,7 @@
                         <child>
                           <object class="GtkComboBoxEntry" id="overchooser">
                             <property name="visible">True</property>
-                            <signal name="changed" handler="set_override_data"/>
+                            <signal name="changed" handler="set_override"/>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -150,7 +150,7 @@
                         <child>
                           <object class="GtkComboBoxEntry" id="palettechooser">
                             <property name="visible">True</property>
-                            <signal name="changed" handler="set_palette_data"/>
+                            <signal name="changed" handler="set_palette"/>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -241,7 +241,7 @@
                         <child>
                           <object class="GtkComboBoxEntry" id="imagechooser">
                             <property name="visible">True</property>
-                            <signal name="changed" handler="set_image_data"/>
+                            <signal name="changed" handler="set_image"/>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>