Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fwife.git;a=commitdiff;h=998f6cde95fda452a5d5aee832ac36897b9acbf9
commit 998f6cde95fda452a5d5aee832ac36897b9acbf9 Author: Elentir <elen...@frugalware.org> Date: Sat May 22 19:10:33 2010 +0200 remove all trailling whitespace diff --git a/README b/README index c692db3..a52745a 100644 --- a/README +++ b/README @@ -6,7 +6,7 @@ Warning : Beta version - Caution - Many bugs, segfaults and memory leaks are pos This version only support netinstall because it's necessary for fwlive. --> Compiling and testing : +-> Compiling and testing : You have to create the configure file. Run './autogen.sh'. Next run './configure OPTIONS'. Use './configure --help' for more details about OPTIONS. diff --git a/autogen.sh b/autogen.sh index 5d3912c..31b73b2 100755 --- a/autogen.sh +++ b/autogen.sh @@ -48,7 +48,7 @@ if [ "$1" == "--dist" ]; then tar czf fwife-$ver.tar.gz fwife-$ver rm -rf fwife-$ver gpg --comment "See http://ftp.frugalware.org/pub/README.GPG for info" \ - -ba -u 20F55619 fwife-$ver.tar.gz + -ba -u 20F55619 fwife-$ver.tar.gz exit 0 fi diff --git a/configure.ac b/configure.ac index 8175639..846bb81 100644 --- a/configure.ac +++ b/configure.ac @@ -73,13 +73,13 @@ fi dnl Check for architecture case "$host" in - i686-*) CARCH="i686" + i686-*) CARCH="i686" ;; - x86_64-*) CARCH="x86_64" + x86_64-*) CARCH="x86_64" ;; ppc-* | powerpc-*) - CARCH="ppc" - ;; + CARCH="ppc" + ;; *) AC_MSG_ERROR([Your architecture is not supported]) ;; @@ -146,10 +146,10 @@ Fwife $VERSION configuration: prefix : ${prefix} source code location : ${srcdir} compiler : ${CC} - compiler flags : ${CFLAGS} - - Architecture compiled : ${CARCH} - + compiler flags : ${CFLAGS} + + Architecture compiled : ${CARCH} + debug support : ${debug} Werror build : ${werror} Strict flags : ${strict} diff --git a/data/kmconf/Makefile.am b/data/kmconf/Makefile.am index 62abf55..412fb74 100644 --- a/data/kmconf/Makefile.am +++ b/data/kmconf/Makefile.am @@ -19,5 +19,5 @@ kmconf_DATA = be \ sk \ uk \ us - + diff --git a/data/scripts/xkeybchange b/data/scripts/xkeybchange index 2658e2c..a47dafb 100644 --- a/data/scripts/xkeybchange +++ b/data/scripts/xkeybchange @@ -21,7 +21,7 @@ else cat <<EOF>> $XTemp Section "InputDevice" Identifier "Keyboard0" - Driver "kbd" + Driver "kbd" Option "XkbLayout" "$1" EndSection EOF diff --git a/src/Makefile.am b/src/Makefile.am index c3069ae..2d31e46 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -3,7 +3,7 @@ includ...@gtk_cflags@ DEFS = @DEFS@ \ -DPLUGINDIR="\"$(pkglibdir)/plugins\"" \ -DIMAGEDIR="\"$(pkgdatadir)/images\"" - + bin_PROGRAMS=fwife @@ -11,7 +11,7 @@ fwife_SOURCES= \ fwife.c \ util.c \ fwife-message.c - + fwife_LDADD= @GTK_LIBS@ fwife_LDFLAGS = -export-dynamic diff --git a/src/fwife-message.c b/src/fwife-message.c index 47f7abc..818f2ed 100644 --- a/src/fwife-message.c +++ b/src/fwife-message.c @@ -1,8 +1,8 @@ /* * fwife.c for Fwife - * + * * Copyright (c) 2009,2010 by Albar Boris <bori...@cegetel.net> - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ @@ -76,7 +76,7 @@ void fwife_info(const char *info_str) gtk_dialog_run (GTK_DIALOG(info_dlg)); - gtk_widget_destroy (info_dlg); + gtk_widget_destroy (info_dlg); return; } diff --git a/src/fwife-message.h b/src/fwife-message.h index a05d8e5..bf8a18f 100644 --- a/src/fwife-message.h +++ b/src/fwife-message.h @@ -1,8 +1,8 @@ /* * util.c for Fwife - * + * * Copyright (c) 2009,2010 by Albar Boris <bori...@cegetel.net> - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ diff --git a/src/fwife.c b/src/fwife.c index de86207..cee207a 100644 --- a/src/fwife.c +++ b/src/fwife.c @@ -1,9 +1,9 @@ /* * fwife.c for Fwife - * + * * Copyright (c) 2005 by Miklos Vajna <vmik...@frugalware.org> * Copyright (c) 2008,2009,2010 by Albar Boris <bori...@cegetel.net> - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ @@ -146,7 +146,7 @@ void fwife_exit(void) free(pages); cleanup_plugins(); - gtk_main_quit(); + gtk_main_quit(); } /* Dialog box for quit the installation */ diff --git a/src/fwife.h b/src/fwife.h index d5aeb5f..aff4031 100644 --- a/src/fwife.h +++ b/src/fwife.h @@ -1,9 +1,9 @@ /* * fwife.h for Fwife - * + * * Copyright (c) 2005 by Miklos Vajna <vmik...@frugalware.org> * Copyright (c) 2008, 2009, 2010 by Albar Boris <bori...@cegetel.net> - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ diff --git a/src/plugins/asklang.c b/src/plugins/asklang.c index eabb270..e33bd1b 100644 --- a/src/plugins/asklang.c +++ b/src/plugins/asklang.c @@ -1,6 +1,6 @@ /* * asklang.c for Fwife - * + * * Copyright (c) 2005, 2007, 2008 by Miklos Vajna <vmik...@frugalware.org> * Copyright (c) 2005 by Christian Hamar alias krix <kr...@linuxforum.hu> * Copyright (c) 2008, 2009 by Albar Boris <bori...@cegetel.net> @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ @@ -46,7 +46,7 @@ char *langs[] = "pt_BR", "Brazilian Portuguese / Português do Brasil", "cs_CZ", "Czech / Cesky", "da_DK", "Danish / Dansk", - "nl_NL", "Dutch / Nederlands", + "nl_NL", "Dutch / Nederlands", "fr_FR", "French / Français", "de_DE", "German / Deutsch", "hu_HU", "Hungarian / Magyar", @@ -176,14 +176,14 @@ int run(GList **config) GtkTreeModel *model = NULL; GtkTreeIter iter; char* selected; - GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(view)); + GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(view)); model = gtk_tree_view_get_model(GTK_TREE_VIEW(GTK_TREE_VIEW(view))); if(gtk_tree_selection_get_selected(selection, &model, &iter)) { gtk_tree_model_get (model, &iter, COLUMN_LANG_CODE, &selected, -1); } else - selected = "en_US"; + selected = "en_US"; setenv("LC_ALL", selected, 1); setenv("LANG", selected, 1); diff --git a/src/plugins/common.h b/src/plugins/common.h index 681a8fd..cd4f3e0 100644 --- a/src/plugins/common.h +++ b/src/plugins/common.h @@ -1,9 +1,9 @@ /* * common.h for Fwife - * + * * Copyright (c) 2005 by Miklos Vajna <vmik...@frugalware.org> * Copyright (c) 2008, 2009 by Albar Boris <bori...@cegetel.net> - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ diff --git a/src/plugins/configsource.c b/src/plugins/configsource.c index 76ffde3..0b79923 100644 --- a/src/plugins/configsource.c +++ b/src/plugins/configsource.c @@ -243,7 +243,7 @@ GtkWidget *mirrorview(void) gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (col), GTK_TREE_VIEW_COLUMN_FIXED); gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (col), 50); gtk_tree_view_append_column(GTK_TREE_VIEW(view), col); - + renderer = gtk_cell_renderer_pixbuf_new(); col = gtk_tree_view_column_new_with_attributes (_("Status"), renderer, "pixbuf", COLUMN_STATUS, NULL); gtk_tree_view_append_column(GTK_TREE_VIEW(view), col); @@ -315,12 +315,12 @@ int prerun(GList **config) GtkTreeIter iter; char *fn, *testurl; int i; - + // get the branch used PACCONF = data_get(*config, "pacconf"); - + while(run_net_config(config) == -1) {} - + if(mirrorlist == NULL) { fn = g_strdup_printf("%s/%s", PACCONFPATH, PACCONF); mirrorlist = getmirrors(fn); @@ -1001,7 +1001,7 @@ int post_net_config(fwnet_profile_t *newprofile, fwnet_interface_t *interface) char *host = strdup("frugalware"); fwnet_writeconfig(newprofile, host); fw_system("netconfig start"); - free(host); + free(host); if(is_connected("www.google.org", 80, 5) < 1) { int ret = fwife_question(_("Fwife cannot connect to internet with this configuration, do you want to apply this configuration anyway?")); @@ -1151,7 +1151,7 @@ int run_net_config(GList **config) if(stat(ptr, &info)) continue; free(ptr); - if(S_ISREG(info.st_mode)) { + if(S_ISREG(info.st_mode)) { ptr = g_strdup_printf(_("An active connection seems to have been found on interface %s using dhcp.\nDo you want to use it?"), ent->d_name); switch(fwife_question(ptr)) { @@ -1227,14 +1227,14 @@ int run_net_config(GList **config) free(newinterface); return -1; } - + fw_system("netconfig stop"); if(post_net_config(newprofile, newinterface) == -1) { free(newprofile); free(newinterface); return -1; } - + /* save network profile for later usage in netconf*/ data_put(config, "netprofile", newprofile); diff --git a/src/plugins/finish.c b/src/plugins/finish.c index 71dae30..f73777b 100644 --- a/src/plugins/finish.c +++ b/src/plugins/finish.c @@ -1,9 +1,9 @@ /* * finish.c for Fwife - * + * * Copyright (c) 2005 by Miklos Vajna <vmik...@frugalware.org> * Copyright (c) 2008, 2009 by Albar Boris <bori...@cegetel.net> - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -16,10 +16,10 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ - + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/plugins/greet.c b/src/plugins/greet.c index 5768c9d..8d2bfaf 100644 --- a/src/plugins/greet.c +++ b/src/plugins/greet.c @@ -1,8 +1,8 @@ /* * greet.c for Fwife - * + * * Copyright (c) 2008,2009,2010 by Albar Boris <bori...@cegetel.net> - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ diff --git a/src/plugins/grubconf.c b/src/plugins/grubconf.c index 2f800b0..b8af2fd 100644 --- a/src/plugins/grubconf.c +++ b/src/plugins/grubconf.c @@ -1,9 +1,9 @@ /* * grubconf.c for Fwife - * + * * Copyright (c) 2005 by Miklos Vajna <vmik...@frugalware.org> * Copyright (c) 2008,2009,2010 by Albar Boris <bori...@cegetel.net> - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -16,10 +16,10 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ - + #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -72,7 +72,7 @@ GtkWidget *load_gtk_widget(void) GtkWidget *pLabelInfo=gtk_label_new(NULL); /* top info label */ - gtk_label_set_markup(GTK_LABEL(pLabelInfo), _("<b>Installing GRUB bootloader</b>")); + gtk_label_set_markup(GTK_LABEL(pLabelInfo), _("<b>Installing GRUB bootloader</b>")); gtk_box_pack_start(GTK_BOX(pVBox), pLabelInfo, FALSE, FALSE, 6); GtkWidget *pLabel = gtk_label_new(_("Choose install type :")); @@ -89,7 +89,7 @@ GtkWidget *load_gtk_widget(void) gtk_box_pack_start(GTK_BOX (pVBox), pRadio3, FALSE, FALSE, 0); GtkWidget *pRadio4 = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON (pRadio1), _("Skip - Skip the installation of GRUB.")); - gtk_box_pack_start(GTK_BOX (pVBox), pRadio4, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX (pVBox), pRadio4, FALSE, FALSE, 0); return pVBox; } diff --git a/src/plugins/install.c b/src/plugins/install.c index 682f7dd..e1f4764 100644 --- a/src/plugins/install.c +++ b/src/plugins/install.c @@ -1,6 +1,6 @@ /* * install.c for Fwife - * + * * Copyright (c) 2008,2009,2010 by Albar Boris <bori...@cegetel.net> * * This program is free software; you can redistribute it and/or modify @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ @@ -78,10 +78,10 @@ plugin_t *info(void) GtkWidget *load_gtk_widget(void) { GtkWidget *vbox; - vbox = gtk_vbox_new (FALSE, 5); + vbox = gtk_vbox_new (FALSE, 5); labelpkg = gtk_label_new(""); progress = gtk_progress_bar_new(); - dlinfo = gtk_label_new(""); + dlinfo = gtk_label_new(""); gtk_box_pack_start (GTK_BOX (vbox), progress, TRUE, FALSE, 5); gtk_box_pack_start (GTK_BOX (vbox), dlinfo, FALSE, FALSE, 5); gtk_box_pack_start (GTK_BOX (vbox), labelpkg, FALSE, FALSE, 5); @@ -163,7 +163,7 @@ int progress_update(PM_NETBUF *ctl, int xferred, void *arg) void progress_install(unsigned char event, char *pkgname, int percent, int howmany, int remain) { - char *main_text = NULL; + char *main_text = NULL; if (!pkgname) return; @@ -179,11 +179,11 @@ void progress_install(unsigned char event, char *pkgname, int percent, int howma break; case PM_TRANS_PROGRESS_UPGRADE_START: main_text = g_strdup (_("Upgrading packages...")); - break; + break; default: return; } - gtk_progress_bar_set_text (GTK_PROGRESS_BAR(progress), main_text); + gtk_progress_bar_set_text (GTK_PROGRESS_BAR(progress), main_text); gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(progress), (float)percent/100); free(main_text); @@ -333,7 +333,7 @@ retry: if(pacman_trans_init(PM_TRANS_TYPE_SYNC, PM_TRANS_FLAG_FORCE|PM_TRANS_FLA questret = fwife_question(_("Some packages seems corrupted, do you want to download them again?")); if(questret == GTK_RESPONSE_YES) { pacman_list_free(pdata); - pacman_trans_release(); + pacman_trans_release(); goto retry; } break; diff --git a/src/plugins/layout.c b/src/plugins/layout.c index 08dbd41..3b8f412 100644 --- a/src/plugins/layout.c +++ b/src/plugins/layout.c @@ -339,7 +339,7 @@ void add_keyboard(GtkWidget *button, gpointer data) gtk_box_pack_start(GTK_BOX(pVBoxFrame), pComboVar, TRUE, FALSE, 0); g_signal_connect (pComboModel, "changed", G_CALLBACK (model_changed),(gpointer)pComboVar); - + /* add items to model combo */ for(i = 0; i < g_list_length(xkeymap); i++) { gtk_combo_box_append_text(GTK_COMBO_BOX(pComboModel), g_list_nth_data(xkeymap, i)); @@ -427,11 +427,11 @@ GtkWidget *load_gtk_widget(void) GtkWidget *entrytest = gtk_entry_new(); GtkWidget *labeltest = gtk_label_new(_("Test your keyboard here :")); GtkWidget *persokeyb = gtk_button_new_with_label(_("Personalized keyboard")); - + char *imgpath = g_strdup_printf("%s/key24.png", IMAGEDIR); GtkWidget *image = gtk_image_new_from_file(imgpath); free(imgpath); - + gtk_button_set_image(GTK_BUTTON(persokeyb), image); g_signal_connect (persokeyb, "clicked", G_CALLBACK (add_keyboard),NULL); diff --git a/src/plugins/netconf.c b/src/plugins/netconf.c index 528e088..3d81f49 100644 --- a/src/plugins/netconf.c +++ b/src/plugins/netconf.c @@ -324,7 +324,7 @@ char *select_entry_point(fwnet_interface_t *interface) return strdup(essidap); } else if(ret == GTK_RESPONSE_APPLY) { gtk_list_store_clear(GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(viewif)))); - g_list_free(listaps); + g_list_free(listaps); } else { gtk_widget_destroy(pBoite); g_list_free(listaps); @@ -465,7 +465,7 @@ int configure_wireless(fwnet_interface_t *interface) GtkWidget *pEntryWpaDriver = gtk_entry_new(); gtk_box_pack_start(GTK_BOX(phboxtemp), pEntryWpaDriver, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(pBoite)->vbox), phboxtemp, FALSE, FALSE, 5); - + struct two_ptr tptr = {interface, pEntryEssid}; g_signal_connect (butaps, "clicked", G_CALLBACK (set_access_point), &tptr); @@ -670,7 +670,7 @@ int add_interface(GtkWidget *button, gpointer data) int retquest = fwife_question(_("This interface has been already configured! Do you want to configure it again?")); if(retquest == GTK_RESPONSE_YES) { free(g_list_nth_data(interfaceslist, i)); - interfaceslist = g_list_delete_link (interfaceslist, g_list_nth(interfaceslist, i)); + interfaceslist = g_list_delete_link (interfaceslist, g_list_nth(interfaceslist, i)); break; } else { return -1; @@ -687,7 +687,7 @@ int add_interface(GtkWidget *button, gpointer data) if(nettype == NULL) return -1; - if(strcmp(nettype, "lo")) { + if(strcmp(nettype, "lo")) { interfaceslist = g_list_append(interfaceslist, newinterface); } @@ -741,7 +741,7 @@ int del_interface(GtkWidget *button, gpointer data) free(g_list_nth_data(interfaceslist, i)); interfaceslist = g_list_delete_link (interfaceslist, g_list_nth(interfaceslist, i)); } - } + } gtk_list_store_set (GTK_LIST_STORE (model), &iter, COLUMN_NET_TYPE, "", -1); } diff --git a/src/plugins/partdisk.c b/src/plugins/partdisk.c index b7f0c96..dba3ef8 100644 --- a/src/plugins/partdisk.c +++ b/src/plugins/partdisk.c @@ -1111,9 +1111,9 @@ int run(GList **config) mountdev(info->dev, info->mount, FALSE, config); } } - + g_list_free(globallist); - + // Copy files into new locations chdir(TARGETDIR); makepath(g_strdup_printf("%s/%s", TARGETDIR, "/etc/profile.d")); diff --git a/src/plugins/postconf.c b/src/plugins/postconf.c index 4334fc6..edad254 100644 --- a/src/plugins/postconf.c +++ b/src/plugins/postconf.c @@ -1,9 +1,9 @@ /* * finish.c for Fwife - * + * * Copyright (c) 2005 by Miklos Vajna <vmik...@frugalware.org> * Copyright (c) 2008,2009,2010 by Albar Boris <bori...@cegetel.net> - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -16,10 +16,10 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ - + #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -302,7 +302,7 @@ int write_dms(char *dms) return -1; fprintf(fd, "# /etc/sysconfig/desktop\n\n"); - fprintf(fd, "# Which session manager try to use.\n\n"); + fprintf(fd, "# Which session manager try to use.\n\n"); if(!strcmp(dms, "KDM")) { @@ -387,7 +387,7 @@ void checkdms(GtkListStore *store) int checkx(void) { char *ptr=NULL; - struct stat buf; + struct stat buf; ptr = g_strdup_printf("%s/usr/bin/xinit", TARGETDIR); if(stat(ptr, &buf)) { @@ -430,7 +430,7 @@ void x_config(GtkWidget *button, gpointer data) GtkWidget *combo; GtkTreeIter iter; GtkListStore *store; - GtkTreeModel *model; + GtkTreeModel *model; //* Check if all necessary x files are present *// if(checkx() == -1) { @@ -631,7 +631,7 @@ int prerun(GList **config) xvariant = (char*)data_get(*config, "xvariant"); } - // configure kernel modules + // configure kernel modules ptr = g_strdup_printf("chroot %s /sbin/depmod -a", TARGETDIR); fw_system(ptr); FREE(ptr); diff --git a/src/plugins/rootconf.c b/src/plugins/rootconf.c index 472a495..266a7a8 100644 --- a/src/plugins/rootconf.c +++ b/src/plugins/rootconf.c @@ -1,8 +1,8 @@ /* * rootconf.c for Fwife - * + * * Copyright (c) 2008,2009,2010 by Albar Boris <bori...@cegetel.net> - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ diff --git a/src/plugins/select.c b/src/plugins/select.c index 625835e..babcda8 100644 --- a/src/plugins/select.c +++ b/src/plugins/select.c @@ -1,9 +1,9 @@ /* * select.c for Fwife - * + * * Copyright (c) 2005 by Miklos Vajna <vmik...@frugalware.org> * Copyright (c) 2008, 2009, 2010 by Albar Boris <bori...@cegetel.net> - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ @@ -97,7 +97,7 @@ GList* group2pkgs(char *group) { PM_GRP *grp; PM_PKG *pkg; - PM_LIST *pmpkgs, *lp; + PM_LIST *pmpkgs, *lp; GList *list = NULL; int i, optional=0, addpkg=1; char *ptr, *pkgname, *pkgfullname, *lang; @@ -356,7 +356,7 @@ void packet_changed(GtkTreeSelection *selection, gpointer data) i = gtk_tree_path_get_indices (path)[0]; gtk_tree_model_get (model, &iter, 1, &selected, -1); gtk_label_set_label(GTK_LABEL(packetinfo), (char*)g_list_nth_data(packets_current, i*4+2)); - } + } } GtkWidget *getpacketlist(void) @@ -422,11 +422,11 @@ void categorie_changed(GtkTreeSelection *selection, gpointer data) if(packets_current) { gtk_list_store_clear(GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(packetlist)))); - - for(i=0; i < g_list_length(packets_current); i+=4 ) - { + + for(i=0; i < g_list_length(packets_current); i+=4 ) + { gtk_list_store_append(GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(packetlist))), &iter); - gtk_list_store_set(GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(packetlist))), &iter, + gtk_list_store_set(GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(packetlist))), &iter, 0, (gboolean)GPOINTER_TO_INT(g_list_nth_data(packets_current, i+3)), 1, (char*)g_list_nth_data(packets_current, i), 2, (char*)g_list_nth_data(packets_current, i+1), -1); @@ -469,7 +469,7 @@ GtkWidget *getcategorieslist(void) GtkTreeViewColumn *col; GtkCellRenderer *renderer; GtkWidget *pScrollbar; - GtkTreeSelection *selection; + GtkTreeSelection *selection; store = gtk_list_store_new(3, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_STRING); model = GTK_TREE_MODEL(store); @@ -489,7 +489,7 @@ GtkWidget *getcategorieslist(void) renderer = gtk_cell_renderer_text_new(); col = gtk_tree_view_column_new_with_attributes (_("Size"), renderer, "text", SIZE_COLUMN, NULL); - gtk_tree_view_append_column(GTK_TREE_VIEW(categories), col); + gtk_tree_view_append_column(GTK_TREE_VIEW(categories), col); gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (categories)), GTK_SELECTION_SINGLE); @@ -562,7 +562,7 @@ GtkWidget *getExpertModeWidget(void) gtk_box_pack_start(GTK_BOX(pvbox), hsepa2, FALSE, FALSE, 0); //* Put the two box into one big *// - gtk_box_pack_start(GTK_BOX(phbox), pvbox, TRUE, TRUE, 0); + gtk_box_pack_start(GTK_BOX(phbox), pvbox, TRUE, TRUE, 0); return phbox; } @@ -588,11 +588,11 @@ void selectallfiles(char *cat, char *exception, int bool) { int i; GList *lispack; - + if(allpackets) { lispack = (GList*)data_get(allpackets, cat); - + if(exception == NULL) { for(i=0; i<g_list_length(lispack); i+=4) @@ -608,7 +608,7 @@ void selectallfiles(char *cat, char *exception, int bool) g_list_nth(lispack, i+3)->data = GINT_TO_POINTER(bool); } } - } + } } //* select (or unselect) a file 'name' in categorie 'cat' *// @@ -620,7 +620,7 @@ void selectfile(char *cat, char* name, int bool) if(allpackets) { lispack = (GList*)data_get(allpackets, cat); - + if(lispack) { for(i=0; i<g_list_length(lispack); i+=4) @@ -672,17 +672,17 @@ void configuredesktop(void) if(!strcmp(seldesk, _("KDE"))) { - selectcat("kde", 1); + selectcat("kde", 1); selectfile("locale-extra", g_strdup_printf("koffice-l10n-%s", lang), 1); selectfile("locale-extra", g_strdup_printf("kde-i18n-%s", lang), 1); } else if(!strcmp(seldesk, _("Gnome"))) { - selectcat("gnome", 1); + selectcat("gnome", 1); } else if(!strcmp(seldesk, _("XFCE"))) { - selectcat("xfce4", 1); + selectcat("xfce4", 1); } else if(!strcmp(seldesk, _("LXDE"))) { @@ -923,7 +923,7 @@ GtkWidget *getBasicModeWidget(void) gtk_signal_connect(GTK_OBJECT(pToggleApp), "toggled", G_CALLBACK(basicmode_change), (gpointer)"XAPP"); gtk_box_pack_start(GTK_BOX(phbox), pToggleApp, TRUE, FALSE, 0); gtk_box_pack_start(GTK_BOX(pvbox), phbox, TRUE, TRUE, 0); - + phbox = gtk_hbox_new(FALSE,5); GtkWidget *pToggleCons = gtk_check_button_new_with_label(_("Console Applications (Nano, Vim...)")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(pToggleCons) , TRUE); @@ -1003,7 +1003,7 @@ GtkWidget *getBasicModeWidget(void) gtk_box_pack_start(GTK_BOX(phbox), pToggleMulex, TRUE, FALSE, 0); gtk_box_pack_start(GTK_BOX(pvbox), phbox, TRUE, TRUE, 0); - //* Put into hbox *// + //* Put into hbox *// gtk_box_pack_start(GTK_BOX(hboxpackage), pvbox, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(pvboxp), hboxpackage, TRUE, TRUE, 0); @@ -1029,11 +1029,11 @@ int prerun(GList **config) { int j; PM_DB *i; - GtkTreeIter iter; + GtkTreeIter iter; GList *pack = NULL; GtkWidget* pBoite; - GtkWidget *progress, *vbox; + GtkWidget *progress, *vbox; gtk_widget_hide(basicmode); gtk_widget_hide(expertmode); @@ -1059,9 +1059,9 @@ int prerun(GList **config) gtk_container_add(GTK_CONTAINER(pBoite), vbox); - gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress), _("Initializing pacman-g2")); - gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(progress), 0.0); - gtk_widget_show_all(pBoite); + gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress), _("Initializing pacman-g2")); + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(progress), 0.0); + gtk_widget_show_all(pBoite); // if an instance of pacman running, set it down pacman_release(); @@ -1099,7 +1099,7 @@ int prerun(GList **config) return(-1); } - gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(progress), 0.5); + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(progress), 0.5); while (gtk_events_pending()) gtk_main_iteration (); @@ -1161,7 +1161,7 @@ int prerun(GList **config) } int run(GList **config) -{ +{ int i, j; PM_LIST *lp, *junk, *sorted, *x; char *ptr; @@ -1202,7 +1202,7 @@ int run(GList **config) if(pacman_trans_prepare(&junk) == -1) { LOG("pacman-g2 error: %s", pacman_strerror(pm_errno)); - // Well well well, LOG pacman deps error at tty4 + // Well well well, LOG pacman deps error at tty4 for(x = pacman_list_first(junk); x; x = pacman_list_next(x)) { PM_DEPMISS *miss = pacman_list_getdata(x); diff --git a/src/plugins/timeconf.c b/src/plugins/timeconf.c index 1bf1acf..da22fab 100644 --- a/src/plugins/timeconf.c +++ b/src/plugins/timeconf.c @@ -1,8 +1,8 @@ /* * timeconf.c for Fwife - * + * * Copyright (c) 2008 by Albar Boris <bori...@cegetel.net> - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ @@ -39,7 +39,7 @@ #define CLOCKFILE "/etc/hardwareclock" #define READZONE "/usr/share/zoneinfo/zone.tab" -#define ZONEFILE "/etc/localtime" +#define ZONEFILE "/etc/localtime" static GtkWidget *drawingmap=NULL; static GdkPixbuf *image=NULL; @@ -105,7 +105,7 @@ void parselatlong(char *latlong, float *latdec, float *longdec) deg = lati/100; } *latdec = ((float)deg)+((float)min/60)+((float)sec/3600); - + if((longi>=1000000) | (longi <=-1000000)) { sec = longi%100; @@ -116,9 +116,9 @@ void parselatlong(char *latlong, float *latdec, float *longdec) { sec = 0; min = longi%100; - deg = longi/100; + deg = longi/100; } - *longdec = ((float)deg)+((float)min/60)+((float)sec/3600); + *longdec = ((float)deg)+((float)min/60)+((float)sec/3600); } void getcartesiancoords(char *latlong, int *xcoord, int *ycoord) @@ -332,7 +332,7 @@ GtkWidget *load_gtk_widget(void) GtkWidget *pVbox, *pScrollbar; GtkWidget *hboximg; - pVbox = gtk_vbox_new(FALSE, 5); + pVbox = gtk_vbox_new(FALSE, 5); hboximg = gtk_hbox_new(FALSE, 5); drawingmap=gtk_drawing_area_new(); @@ -340,7 +340,7 @@ GtkWidget *load_gtk_widget(void) image = gdk_pixbuf_new_from_file(g_strdup_printf("%s/timemap.png", IMAGEDIR), NULL); gtk_widget_set_size_request(drawingmap, gdk_pixbuf_get_width(image), gdk_pixbuf_get_height(image)); - g_signal_connect(G_OBJECT(drawingmap),"expose_event", (GCallback)affiche_dessin, NULL); + g_signal_connect(G_OBJECT(drawingmap),"expose_event", (GCallback)affiche_dessin, NULL); // drawing map need to be center manually gint width, height; @@ -398,7 +398,7 @@ int prerun(GList **config) GtkTreePath *path = NULL; GtkTreeView *treeview = (GtkTreeView *)timeview; - GtkTreeModel *model = gtk_tree_view_get_model (treeview); + GtkTreeModel *model = gtk_tree_view_get_model (treeview); char *country, *city, *elem; fwifetime_find(); diff --git a/src/plugins/usersconf.c b/src/plugins/usersconf.c index 471b97f..92ecb36 100644 --- a/src/plugins/usersconf.c +++ b/src/plugins/usersconf.c @@ -1,8 +1,8 @@ /* * userconf.c for Fwife - * + * * Copyright (c) 2008,2009,2010 by Albar Boris <bori...@cegetel.net> - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -15,7 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ @@ -116,14 +116,14 @@ void add_user(GtkWidget *widget, gpointer data) gtk_window_set_position(GTK_WINDOW(pBoite), GTK_WIN_POS_CENTER_ON_PARENT); pVBox = gtk_vbox_new(TRUE, 0); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(pBoite)->vbox), pVBox, TRUE, FALSE, 5); + gtk_box_pack_start(GTK_BOX(GTK_DIALOG(pBoite)->vbox), pVBox, TRUE, FALSE, 5); pFrame = gtk_frame_new(_("General Configuration")); gtk_box_pack_start(GTK_BOX(pVBox), pFrame, TRUE, FALSE, 0); pVBoxFrame = gtk_vbox_new(TRUE, 0); - gtk_container_add(GTK_CONTAINER(pFrame), pVBoxFrame); - + gtk_container_add(GTK_CONTAINER(pFrame), pVBoxFrame); + pLabel = gtk_label_new(_("Name :")); gtk_box_pack_start(GTK_BOX(pVBoxFrame), pLabel, TRUE, FALSE, 0); pEntryName = gtk_entry_new(); @@ -271,7 +271,7 @@ GtkWidget *load_gtk_widget(void) /* top info label */ infolabl = gtk_label_new(NULL); - gtk_label_set_markup(GTK_LABEL(infolabl), _("<b>You can configure non-root user account. It is strongly recommended to create one.</b>")); + gtk_label_set_markup(GTK_LABEL(infolabl), _("<b>You can configure non-root user account. It is strongly recommended to create one.</b>")); store = gtk_list_store_new(6, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, GDK_TYPE_PIXBUF); model = GTK_TREE_MODEL(store); @@ -303,7 +303,7 @@ GtkWidget *load_gtk_widget(void) renderer = gtk_cell_renderer_pixbuf_new(); col = gtk_tree_view_column_new_with_attributes (_("Password"), renderer, "pixbuf", COLUMN_USR_PASS, NULL); gtk_tree_view_column_set_alignment (col, 0.5); - gtk_tree_view_append_column(GTK_TREE_VIEW(view), col); + gtk_tree_view_append_column(GTK_TREE_VIEW(view), col); selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view)); gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE); diff --git a/src/util.c b/src/util.c index 578a535..9ce70e7 100644 --- a/src/util.c +++ b/src/util.c @@ -1,10 +1,10 @@ /* * util.c for Fwife - * + * * Copyright (c) 2005-2007 by Miklos Vajna <vmik...@frugalware.org> * Copyright (c) 2006 by Alex Smith <a...@alex-smith.me.uk> * Copyright (c) 2008, 2009 by Albar Boris <bori...@cegetel.net> - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -17,10 +17,10 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */ - + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/src/util.h b/src/util.h index 306096b..1d5c932 100644 --- a/src/util.h +++ b/src/util.h @@ -1,10 +1,10 @@ /* * util.c for Fwife - * + * * Copyright (c) 2005-2007 by Miklos Vajna <vmik...@frugalware.org> * Copyright (c) 2006 by Alex Smith <a...@alex-smith.me.uk> * Copyright (c) 2008, 2009 by Albar Boris <bori...@cegetel.net> - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, * USA. */
_______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
