lol
authorPhilip Kovacs <pkovacs@users.sourceforge.net>
Sat, 7 Oct 2006 01:42:37 +0000 (01:42 +0000)
committerPhilip Kovacs <pkovacs@users.sourceforge.net>
Sat, 7 Oct 2006 01:42:37 +0000 (01:42 +0000)
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@710 7f574dfc-610e-0410-a909-a81674777703

src/conky.c
src/conky.h

index 6d21d21..ff33b82 100644 (file)
@@ -3320,12 +3320,12 @@ static void generate_text_internal(char *p, int p_max_size, struct text_object *
                                }
                                OBJ(freq) {
                                        if (obj->a) {
-                                               obj->a = get_freq(p, p_max_size, "%.0f", 1, obj->data.cpu_index); /* pk */
+                                               obj->a = get_freq(p, p_max_size, "%.0f", 1, obj->data.cpu_index); 
                                        }
                                }
                                OBJ(freq_g) {
                                        if (obj->a) {
-                                               obj->a = get_freq(p, p_max_size, "%'.2f", 1000, obj->data.cpu_index); /* pk */
+                                               obj->a = get_freq(p, p_max_size, "%'.2f", 1000, obj->data.cpu_index); 
                                        }
                                }
 #if defined(__linux__)
@@ -3343,29 +3343,29 @@ static void generate_text_internal(char *p, int p_max_size, struct text_object *
 
                                OBJ(freq_dyn) {
                                        if (use_spacer) {
-                                               get_freq_dynamic(p, 6, "%.0f     ", 1 ); /* pk */
+                                               get_freq_dynamic(p, 6, "%.0f     ", 1 ); 
                                        } else {
-                                               get_freq_dynamic(p, p_max_size, "%.0f", 1 ); /* pk */
+                                               get_freq_dynamic(p, p_max_size, "%.0f", 1 ); 
                                        }
                                }
                                OBJ(freq_dyn_g) {
                                        if (use_spacer) {
-                                               get_freq_dynamic(p, 6, "%'.2f     ", 1000); /* pk */
+                                               get_freq_dynamic(p, 6, "%'.2f     ", 1000); 
                                        } else {
-                                               get_freq_dynamic(p, p_max_size, "%'.2f", 1000); /* pk */
+                                               get_freq_dynamic(p, p_max_size, "%'.2f", 1000); 
                                        }
                                }
                                OBJ(adt746xcpu) {
-                                       get_adt746x_cpu(p, p_max_size); /* pk */
+                                       get_adt746x_cpu(p, p_max_size); 
                                }
                                OBJ(adt746xfan) {
-                                       get_adt746x_fan(p, p_max_size); /* pk */
+                                       get_adt746x_fan(p, p_max_size); 
                                }
                                OBJ(acpifan) {
-                                       get_acpi_fan(p, p_max_size);  /* pk */
+                                       get_acpi_fan(p, p_max_size);  
                                }
                                OBJ(acpiacadapter) {
-                                       get_acpi_ac_adapter(p, p_max_size); /* pk */
+                                       get_acpi_ac_adapter(p, p_max_size); 
                                }
                                OBJ(battery) {
                                        get_battery_stuff(p, p_max_size, obj->data.s);
@@ -7210,6 +7210,6 @@ void signal_handler(int sig)
 {
        /* signal handler is light as a feather, as it should be. 
         * we will poll g_signal_pending with each loop of conky
-        * and do any signal processing there, NOT here.  pkovacs. */
+        * and do any signal processing there, NOT here. */
        g_signal_pending=sig;
 }
index 27d6656..8fca7e8 100644 (file)
@@ -461,22 +461,22 @@ void update_cpu_usage(void);
 void update_total_processes(void);
 void update_running_processes(void);
 void update_i8k(void);
-char get_freq( char *, size_t, char *, int, unsigned int ); /* pk */
-void get_freq_dynamic( char *, size_t, char *, int ); /* pk */
+char get_freq( char *, size_t, char *, int, unsigned int ); 
+void get_freq_dynamic( char *, size_t, char *, int ); 
 char get_voltage(char *, size_t, char *, int, unsigned int ); /* ptarjan */
 void update_load_average();
 int open_i2c_sensor(const char *dev, const char *type, int n, int *div,
                    char *devtype);
 double get_i2c_info(int *fd, int arg, char *devtype, char *type);
 
-void get_adt746x_cpu( char *, size_t ); /* pk */
-void get_adt746x_fan( char *, size_t ); /* pk */
+void get_adt746x_cpu( char *, size_t ); 
+void get_adt746x_fan( char *, size_t ); 
 unsigned int get_diskio(void);
 
 int open_acpi_temperature(const char *name);
 double get_acpi_temperature(int fd);
-void get_acpi_ac_adapter( char *, size_t ); /* pk */
-void get_acpi_fan( char *, size_t ); /* pk */
+void get_acpi_ac_adapter( char *, size_t ); 
+void get_acpi_fan( char *, size_t ); 
 void get_battery_stuff(char *buf, unsigned int n, const char *bat);
 void get_ibm_acpi_fan(char *buf, size_t client_buffer_size);
 void get_ibm_acpi_temps(void);