diff options
| author | Stefano Karapetsas <[email protected]> | 2011-11-23 18:23:41 +0100 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2011-11-23 18:23:41 +0100 |
| commit | c355361668a3efc27d957861162bef4e077a1485 (patch) | |
| tree | b9159930f23470cdb238fe654f68ff0472766ab6 /sensors-applet | |
| parent | ee1b0cc3814f5e54cadde518130b019f048b3be2 (diff) | |
| download | mate-sensors-applet-c355361668a3efc27d957861162bef4e077a1485.tar.bz2 mate-sensors-applet-c355361668a3efc27d957861162bef4e077a1485.tar.xz | |
solved some conflicts with sensors-applet
Diffstat (limited to 'sensors-applet')
| -rw-r--r-- | sensors-applet/Makefile.am | 4 | ||||
| -rw-r--r-- | sensors-applet/about-dialog.c | 5 | ||||
| -rw-r--r-- | sensors-applet/sensors-applet.h | 18 |
3 files changed, 14 insertions, 13 deletions
diff --git a/sensors-applet/Makefile.am b/sensors-applet/Makefile.am index bce8d57..eae9e71 100644 --- a/sensors-applet/Makefile.am +++ b/sensors-applet/Makefile.am @@ -42,9 +42,9 @@ sensors_applet_SOURCES = main.c \ # install headers for plugins to use INST_H_FILES = sensors-applet-plugin.h sensors-applet-sensor.h -headerdir = $(prefix)/include/sensors-applet +headerdir = $(prefix)/include/mate-sensors-applet header_DATA = $(INST_H_FILES) # since it is separate -EXTRA_DIST = sensors-applet-plugin.h
\ No newline at end of file +EXTRA_DIST = sensors-applet-plugin.h diff --git a/sensors-applet/about-dialog.c b/sensors-applet/about-dialog.c index 0a538d2..21bd21d 100644 --- a/sensors-applet/about-dialog.c +++ b/sensors-applet/about-dialog.c @@ -27,6 +27,7 @@ void about_dialog_open(SensorsApplet *sensors_applet) { gchar *translator; const gchar *authors[] = { "Alex Murray <[email protected]>", + "Stefano Karapetsas <[email protected]>", NULL }; @@ -40,12 +41,12 @@ void about_dialog_open(SensorsApplet *sensors_applet) { gtk_show_about_dialog(NULL, "program-name", PACKAGE_NAME, "version", PACKAGE_VERSION, - "copyright", "(C) 2005-2009, Alex Murray <[email protected]>", + "copyright", "(C) 2005-2009, Alex Murray <[email protected]>\n(C) 2011, Stefano Karapetsas <[email protected]>", "authors", authors, "documenters", authors, "translator-credits", translator, "logo-icon-name", SENSORS_APPLET_ICON, - "website", "http://sensors-applet.sourceforge.net/", + "website", "https://github.com/stefano-k/mate-sensors-applet", NULL); diff --git a/sensors-applet/sensors-applet.h b/sensors-applet/sensors-applet.h index 3aecb18..5ddd9dc 100644 --- a/sensors-applet/sensors-applet.h +++ b/sensors-applet/sensors-applet.h @@ -36,17 +36,17 @@ typedef struct _ActiveSensor ActiveSensor; #include "prefs-dialog.h" #define GRAPH_FRAME_EXTRA_WIDTH 6 -#define SENSORS_APPLET_ICON "sensors-applet" +#define SENSORS_APPLET_ICON "mate-sensors-applet" static const gchar * const stock_icons[NUM_ICONS] = { - "sensors-applet-cpu", - "sensors-applet-drive-harddisk", - "sensors-applet-battery", - "sensors-applet-memory", - "sensors-applet-gpu", - "sensors-applet-chip", - "sensors-applet-fan", - "sensors-applet-case" + "mate-sensors-applet-cpu", + "mate-sensors-applet-drive-harddisk", + "mate-sensors-applet-battery", + "mate-sensors-applet-memory", + "mate-sensors-applet-gpu", + "mate-sensors-applet-chip", + "mate-sensors-applet-fan", + "mate-sensors-applet-case" }; #define DEFAULT_ICON_SIZE 22 |