Skip to content

Commit

Permalink
More cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
Mystro256 committed Nov 16, 2016
1 parent f15b78b commit 9228081
Showing 5 changed files with 14 additions and 18 deletions.
10 changes: 2 additions & 8 deletions src/gui.c
Original file line number Diff line number Diff line change
@@ -20,17 +20,11 @@
*/

#include "main.h"
#include "prefs.h"

extern int tf;
extern int update_time;
extern char *imagefile;
extern char *home_dir;

int usedefaulttheme = FALSE;
GtkWidget *mainwindow = NULL;

GdkPixbuf *theme = NULL;
gboolean usedefaulttheme = FALSE;

GdkPixbuf *icon = NULL;

/* Destroy the main window. */
5 changes: 5 additions & 0 deletions src/gui.h
Original file line number Diff line number Diff line change
@@ -44,6 +44,11 @@ enum { VOLT, TEMP, FAN };
"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, Boston, MA\n"\
"02110-1301 USA."

/* Public vars */
extern int usedefaulttheme;
extern GtkWidget *mainwindow;
extern GdkPixbuf *theme;

/* Prototypes */
gint destroy_gui( GtkWidget *, gpointer );
#if GTK_MAJOR_VERSION == 2
1 change: 0 additions & 1 deletion src/main.c
Original file line number Diff line number Diff line change
@@ -26,7 +26,6 @@

char *strdup(const char *s);

/* Our public vars */
int tf = FALSE;
int update_time = 1;
char *imagefile = NULL;
8 changes: 7 additions & 1 deletion src/main.h
Original file line number Diff line number Diff line change
@@ -19,7 +19,6 @@
02110-1301 USA.
*/


#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -32,7 +31,14 @@
#include <gdk/gdk.h>
#include "chips.h"
#include "gui.h"
#include "prefs.h"
#include "../config.h"

/* Pretty identifiers. */
enum { SUCCESS, FAILURE };

/* Public vars */
extern int tf;
extern int update_time;
extern char *imagefile;
extern const char *home_dir;
8 changes: 0 additions & 8 deletions src/prefs.c
Original file line number Diff line number Diff line change
@@ -20,14 +20,6 @@
*/

#include "main.h"
#include "prefs.h"

extern int tf;
extern int update_time;
extern int usedefaulttheme;
extern GdkPixbuf *theme;
extern GtkWidget *mainwindow;
extern char *home_dir;

GdkPixbuf *temptheme = NULL;
GtkWidget *prefwindow = NULL;

0 comments on commit 9228081

Please sign in to comment.