grim/guifications1

I hope this doesn't break shit...

2004-01-02, grim
40ab9f7da36f
Parents 40f5c1cf6282
Children 48a8f54744d5
I hope this doesn't break shit...
4 files changed, 21 insertions(+), 17 deletions(-)
  • +3 -8
    Makefile.am
  • +5 -1
    Makefile.mingw
  • +5 -0
    gf_theme.h
  • +8 -8
    gf_theme_editor.c
    • --- a/Makefile.am Mon Dec 29 05:00:37 2003 +0000
    +++ b/Makefile.am Fri Jan 02 10:36:23 2004 +0000
    @@ -19,18 +19,12 @@
    guificat_la_SOURCES = \
    guifications.c \
    - guificatoins.h \
    gf_conf.c \
    - gf_conf.h \
    gf_prefs.c \
    - gf_prefs.h \
    gf_utils.c \
    - gf_utils.h \
    gf_pngs.c \
    - gf_pngs.h \
    - gf_types.h \
    gf_gtkutils.c \
    - gf_gtkutils.h
    + gf_theme.c
    bin_PROGRAMS = gf_theme_edit
    @@ -38,7 +32,8 @@
    gf_theme_editor.c \
    gf_pngs.c \
    grimdirtreeview.c \
    - gf_gtkutils.c
    + gf_gtkutils.c \
    + gf_theme.c
    gf_theme_edit_DEPENDENCIES = \
    @LIBOBJS@ \
    --- a/Makefile.mingw Mon Dec 29 05:00:37 2003 +0000
    +++ b/Makefile.mingw Fri Jan 02 10:36:23 2004 +0000
    @@ -63,12 +63,16 @@
    gf_conf.c \
    gf_prefs.c \
    gf_utils.c \
    - gf_pngs.c
    + gf_pngs.c \
    + gf_gtkutils.c \
    + gf_theme.c
    THEMER_SRC = \
    gf_theme_editor.c \
    gtkdirtreeview.c \
    gf_pngs.c \
    + gf_theme.c \
    + gf_gtkutils.c \
    $(GAIM_TOP)/src/xmlnode.c
    PLUGIN_OBJ = $(PLUGIN_SRC:%.c=%.o)
    --- a/gf_theme.h Mon Dec 29 05:00:37 2003 +0000
    +++ b/gf_theme.h Fri Jan 02 10:36:23 2004 +0000
    @@ -66,4 +66,9 @@
    } data;
    } gf_theme;
    +/***********************************************************************
    + * Exports
    + **********************************************************************/
    +gboolean read_theme(gchar *path, gf_theme *theme, gchar **error);
    +
    #endif
    --- a/gf_theme_editor.c Mon Dec 29 05:00:37 2003 +0000
    +++ b/gf_theme_editor.c Fri Jan 02 10:36:23 2004 +0000
    @@ -68,7 +68,7 @@
    static void update_modified(gboolean modified);
    /* helpers */
    -static GtkWidget *make_file_dialog(gchar *title, gboolean open, gboolean quit);
    +static GtkWidget *make_dir_dialog(gchar *title, gboolean open, gboolean quit);
    /* Callbacks */
    static gboolean close_editor(GtkWidget *widget, GdkEvent *event, gpointer data);
    @@ -91,7 +91,7 @@
    static void color_dialog(GtkWidget *widget, gpointer data);
    static void color_dialog_ok(GtkWidget *widget, gpointer data);
    static void modified_message_response_cb(GtkWidget *widget, gint response_id, gpointer data);
    -static void file_dialog_cb(GtkWidget *widget, gint response_id, gpointer data);
    +static void dir_dialog_cb(GtkWidget *widget, gint response_id, gpointer data);
    /***********************************************************************
    * Menu
    **********************************************************************/
    @@ -564,7 +564,7 @@
    }
    /**********************************************************************/
    static GtkWidget *
    -make_file_dialog(gchar *title, gboolean open, gboolean quit) {
    +make_dir_dialog(gchar *title, gboolean open, gboolean quit) {
    GtkWidget *dialog, *scrolled_window, *dir_tree;
    dialog = gtk_dialog_new_with_buttons(title, GTK_WINDOW(window), GTK_DIALOG_MODAL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL);
    @@ -584,7 +584,7 @@
    g_object_set_data(G_OBJECT(dialog), "open", (gpointer)open);
    g_object_set_data(G_OBJECT(dialog), "quit", (gpointer)quit);
    - g_signal_connect(G_OBJECT(dialog), "response", G_CALLBACK(file_dialog_cb), (gpointer)dialog);
    + g_signal_connect(G_OBJECT(dialog), "response", G_CALLBACK(dir_dialog_cb), (gpointer)dialog);
    return dialog;
    }
    @@ -625,7 +625,7 @@
    menu_open_cb() {
    GtkWidget *dialog;
    - dialog = make_file_dialog("Open...", TRUE, FALSE);
    + dialog = make_dir_dialog("Open...", TRUE, FALSE);
    gtk_widget_show(dialog);
    }
    @@ -643,7 +643,7 @@
    menu_save_as_cb() {
    GtkWidget *dialog;
    - dialog = make_file_dialog("Save As...", FALSE, FALSE);
    + dialog = make_dir_dialog("Save As...", FALSE, FALSE);
    gtk_widget_show(dialog);
    }
    @@ -1041,9 +1041,10 @@
    }
    /**********************************************************************/
    static void
    -file_dialog_cb(GtkWidget *widget, gint response_id, gpointer data) {
    +dir_dialog_cb(GtkWidget *widget, gint response_id, gpointer data) {
    GtkWidget *dialog = (GtkWidget*)data;
    GtkWidget *overwrite_dialog = NULL;
    + gchar *file = NULL;
    gboolean open = (gboolean)g_object_get_data(G_OBJECT(dialog), "open");
    gboolean quit = (gboolean)g_object_get_data(G_OBJECT(dialog), "quit");
    @@ -1051,7 +1052,6 @@
    printf("ok clicked\n");
    if (open) {
    -
    }
    else {
    if (quit) {