grim/guifications1

a little more cleanup..

2004-01-14, grim
b6dd91a62d6e
Parents f557af1954b6
Children 3a2e4429a218
a little more cleanup..
8 files changed, 40 insertions(+), 35 deletions(-)
  • +1 -0
    src/gf_gtkutils.c
  • +1 -0
    src/gf_gtkutils.h
  • +1 -0
    src/gf_pngs.c
  • +1 -0
    src/gf_pngs.h
  • +1 -0
    src/gf_prefs.c
  • +33 -2
    src/gf_theme.h
  • +0 -33
    src/gf_types.h
  • +2 -0
    src/gf_utils.c
    • --- a/src/gf_gtkutils.c Wed Jan 14 20:33:37 2004 +0000
    +++ b/src/gf_gtkutils.c Wed Jan 14 22:48:41 2004 +0000
    @@ -20,6 +20,7 @@
    #include "gf_gtkutils.h"
    #include "gf_types.h"
    +#include "gf_theme.h"
    #include "gf_pngs.h"
    /***********************************************************************
    --- a/src/gf_gtkutils.h Wed Jan 14 20:33:37 2004 +0000
    +++ b/src/gf_gtkutils.h Wed Jan 14 22:48:41 2004 +0000
    @@ -22,6 +22,7 @@
    #include <gtk/gtk.h>
    #include "gf_types.h"
    +#include "gf_theme.h"
    GtkWidget *gf_make_hig_frame(GtkWidget *parent, const gchar *title);
    GtkWidget *gf_make_label(gchar *text, GtkSizeGroup *sg);
    --- a/src/gf_pngs.c Wed Jan 14 20:33:37 2004 +0000
    +++ b/src/gf_pngs.c Wed Jan 14 22:48:41 2004 +0000
    @@ -27,6 +27,7 @@
    #include "gf_pngs.h"
    #include "gf_types.h"
    +#include "gf_theme.h"
    /***********************************************************************
    * Statics
    --- a/src/gf_pngs.h Wed Jan 14 20:33:37 2004 +0000
    +++ b/src/gf_pngs.h Wed Jan 14 22:48:41 2004 +0000
    @@ -22,6 +22,7 @@
    #include <gdk-pixbuf/gdk-pixbuf.h>
    #include "gf_types.h"
    +#include "gf_theme.h"
    /***********************************************************************
    * Exports
    **********************************************************************/
    --- a/src/gf_prefs.c Wed Jan 14 20:33:37 2004 +0000
    +++ b/src/gf_prefs.c Wed Jan 14 22:48:41 2004 +0000
    @@ -20,6 +20,7 @@
    #include "debug.h"
    #include "gf_types.h"
    +#include "gf_theme.h"
    #include "gf_prefs.h"
    /**********************************************************************/
    --- a/src/gf_theme.h Wed Jan 14 20:33:37 2004 +0000
    +++ b/src/gf_theme.h Wed Jan 14 22:48:41 2004 +0000
    @@ -21,8 +21,6 @@
    #include <glib.h>
    -#include "gf_types.h"
    -
    typedef enum _gf_theme_info {
    gf_theme_info_name = 0,
    gf_theme_info_version,
    @@ -31,6 +29,39 @@
    gf_theme_info_website
    } gf_theme_info;
    +typedef enum _gf_item_position {
    + item_position_nw = 0,
    + item_position_n,
    + item_position_ne,
    + item_position_w,
    + item_position_c,
    + item_position_e,
    + item_position_sw,
    + item_position_s,
    + item_position_se
    +} gf_item_position;
    +
    +typedef enum _gf_text_clipping {
    + text_clipping_truncate = 0,
    + text_clipping_elipse_start,
    + text_clipping_elipse_middle,
    + text_clipping_elipse_end
    +} gf_text_clipping;
    +
    +typedef enum _gf_icon {
    + icon_protocol = 0,
    + icon_buddy,
    + icon_status
    +} gf_icon;
    +
    +typedef enum _gf_icon_size {
    + icon_size_tiny = 0,
    + icon_size_small,
    + icon_size_normal,
    + icon_size_large,
    + icon_size_huge
    +} gf_icon_size;
    +
    typedef struct _gf_theme_item {
    gboolean visible;
    gint offset_horizontal;
    --- a/src/gf_types.h Wed Jan 14 20:33:37 2004 +0000
    +++ b/src/gf_types.h Wed Jan 14 22:48:41 2004 +0000
    @@ -55,37 +55,4 @@
    window_zoom_25
    } gf_window_zoom;
    -typedef enum _gf_item_position {
    - item_position_nw = 0,
    - item_position_n,
    - item_position_ne,
    - item_position_w,
    - item_position_c,
    - item_position_e,
    - item_position_sw,
    - item_position_s,
    - item_position_se
    -} gf_item_position;
    -
    -typedef enum _gf_text_clipping {
    - text_clipping_truncate = 0,
    - text_clipping_elipse_start,
    - text_clipping_elipse_middle,
    - text_clipping_elipse_end
    -} gf_text_clipping;
    -
    -typedef enum _gf_icon {
    - icon_protocol = 0,
    - icon_buddy,
    - icon_status
    -} gf_icon;
    -
    -typedef enum _gf_icon_size {
    - icon_size_tiny = 0,
    - icon_size_small,
    - icon_size_normal,
    - icon_size_large,
    - icon_size_huge
    -} gf_icon_size;
    -
    #endif
    --- a/src/gf_utils.c Wed Jan 14 20:33:37 2004 +0000
    +++ b/src/gf_utils.c Wed Jan 14 22:48:41 2004 +0000
    @@ -33,6 +33,8 @@
    #endif
    #include "gf_utils.h"
    +#include "gf_types.h"
    +#include "gf_theme.h"
    #include "gf_prefs.h"
    /**********************************************************************/