Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=9df16d36fef2fedcbd0b4b80fe85f2290ee3773b
commit 9df16d36fef2fedcbd0b4b80fe85f2290ee3773b
Author: Priyank <[EMAIL PROTECTED]>
Date: Sat Feb 9 13:30:54 2008 +0530
gfpm-interface: added a new function gfpm_get_widget() as a wrapper to
glade_xml_get_widget()
* replaced all glade_xml_get_widget() calls by gfpm_get_widget()
* fixed a couple of compile-time warnings
diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c
index a85e447..51786e3 100644
--- a/src/gfpm-interface.c
+++ b/src/gfpm-interface.c
@@ -140,6 +140,12 @@ gfpm_populate_repos_combobox (GtkComboBox *combo)
return c_index;
}
+GtkWidget *
+gfpm_get_widget (const char *wname)
+{
+ return (glade_xml_get_widget(xml,wname));
+}
+
void
gfpm_interface_init (void)
{
@@ -151,30 +157,30 @@ gfpm_interface_init (void)
GtkTreeViewColumn *column;
gchar *title = NULL;
- gfpm_mw = glade_xml_get_widget (xml, "mainwindow");
- gfpm_splash = glade_xml_get_widget (xml, "splash_window");
- gfpm_statusbar = glade_xml_get_widget (xml, "statusbar");
+ gfpm_mw = gfpm_get_widget ("mainwindow");
+ gfpm_splash = gfpm_get_widget ("splash_window");
+ gfpm_statusbar = gfpm_get_widget ("statusbar");
gtk_widget_show (gfpm_splash);
while (gtk_events_pending())
gtk_main_iteration ();
sleep (1);
- gfpm_groups_tvw = glade_xml_get_widget (xml, "grouptreeview");
- gfpm_pkgs_tvw = glade_xml_get_widget (xml, "pkgstreeview");
- gfpm_info_tvw = glade_xml_get_widget (xml, "infotreeview");
- gfpm_files_txtvw = glade_xml_get_widget (xml, "filestextview");
- gfpm_clog_txtvw = glade_xml_get_widget (xml, "changelogtextview");
- gfpm_clrold_opt = glade_xml_get_widget (xml, "rem_old_opt");
- gfpm_clrall_opt = glade_xml_get_widget (xml, "rem_all_opt");
- gfpm_inst_from_file_dlg = glade_xml_get_widget (xml,
"inst_from_file_dlg");
- gfpm_inst_filechooser = glade_xml_get_widget (xml,
"gfpm_inst_filechooser");
- gfpm_inst_depcheck = glade_xml_get_widget (xml, "depcheck");
- gfpm_inst_upgcheck = glade_xml_get_widget (xml, "upgcheck");
- gfpm_inst_forcheck = glade_xml_get_widget (xml, "forcheck");
- gfpm_apply_inst_depcheck = glade_xml_get_widget (xml,
"applyinstdepcheck");
- gfpm_apply_rem_depcheck = glade_xml_get_widget (xml,
"applyremdepcheck");
- gfpm_apply_inst_dwocheck = glade_xml_get_widget (xml,
"applyinstdwcheck");
- gfpm_search_combo = glade_xml_get_widget (xml, "search_repocombo");
+ gfpm_groups_tvw = gfpm_get_widget ("grouptreeview");
+ gfpm_pkgs_tvw = gfpm_get_widget ("pkgstreeview");
+ gfpm_info_tvw = gfpm_get_widget ("infotreeview");
+ gfpm_files_txtvw = gfpm_get_widget ("filestextview");
+ gfpm_clog_txtvw = gfpm_get_widget ("changelogtextview");
+ gfpm_clrold_opt = gfpm_get_widget ("rem_old_opt");
+ gfpm_clrall_opt = gfpm_get_widget ("rem_all_opt");
+ gfpm_inst_from_file_dlg = gfpm_get_widget ("inst_from_file_dlg");
+ gfpm_inst_filechooser = gfpm_get_widget ("gfpm_inst_filechooser");
+ gfpm_inst_depcheck = gfpm_get_widget ("depcheck");
+ gfpm_inst_upgcheck = gfpm_get_widget ("upgcheck");
+ gfpm_inst_forcheck = gfpm_get_widget ("forcheck");
+ gfpm_apply_inst_depcheck = gfpm_get_widget ("applyinstdepcheck");
+ gfpm_apply_rem_depcheck = gfpm_get_widget ("applyremdepcheck");
+ gfpm_apply_inst_dwocheck = gfpm_get_widget ("applyinstdwcheck");
+ gfpm_search_combo = gfpm_get_widget ("search_repocombo");
/* Setup groups treeview */
store = gtk_list_store_new (1, G_TYPE_STRING);
@@ -258,7 +264,7 @@ gfpm_interface_init (void)
g_object_set (gfpm_info_tvw, "hover-selection", TRUE, NULL);
/* Setup repository combobox */
- widget = glade_xml_get_widget (xml, "combobox_repos");
+ widget = gfpm_get_widget ("combobox_repos");
if (gfpm_db_populate_repolist() == 0)
{
guint active;
diff --git a/src/gfpm-interface.h b/src/gfpm-interface.h
index 5b9cf02..e2adb2d 100644
--- a/src/gfpm-interface.h
+++ b/src/gfpm-interface.h
@@ -10,6 +10,7 @@
#include <gtk/gtk.h>
#include "gfpm.h"
+GtkWidget * gfpm_get_widget (const char *);
void gfpm_update_status (const char *);
void gfpm_load_groups_tvw (const char *);
void gfpm_load_pkgs_tvw (const char *);
diff --git a/src/gfpm-logviewer.c b/src/gfpm-logviewer.c
index 318ab83..2d2403f 100644
--- a/src/gfpm-logviewer.c
+++ b/src/gfpm-logviewer.c
@@ -20,6 +20,7 @@
#include "gfpm-logviewer.h"
#include "gfpm-messages.h"
+#include "gfpm-interface.h"
#include <libfwutil.h>
#include <glib.h>
#include <time.h>
@@ -36,8 +37,6 @@ typedef struct _LogViewItem
/* location of datemsk file */
#define DMK_FILE "/share/gfpm/datemsk"
-extern GladeXML *xml;
-
int getdate_err;
/* Log viewer widgets */
@@ -64,9 +63,9 @@ gfpm_logviewer_init (void)
setenv ("DATEMSK", loc, 0);
g_free (loc);
}
- gfpm_logviewer_dlg = glade_xml_get_widget (xml, "syslog_window");
- gfpm_logviewer_tvw = glade_xml_get_widget (xml, "log_tvw");
- gfpm_logviewer_txtvw = glade_xml_get_widget (xml, "log_txtvw");
+ gfpm_logviewer_dlg = gfpm_get_widget ("syslog_window");
+ gfpm_logviewer_tvw = gfpm_get_widget ("log_tvw");
+ gfpm_logviewer_txtvw = gfpm_get_widget ("log_txtvw");
renderer = gtk_cell_renderer_text_new ();
g_object_set (renderer, "xalign", 0.0, NULL);
diff --git a/src/gfpm-optimizedb.c b/src/gfpm-optimizedb.c
index efe17f5..b1c8261 100644
--- a/src/gfpm-optimizedb.c
+++ b/src/gfpm-optimizedb.c
@@ -33,8 +33,6 @@
#define NEWSUM "/tmp/dbsums.new"
#define LOCKFILE "/tmp/pacman-g2.lck"
-extern GladeXML *xml;
-
static GtkWidget *gfpm_optimize_db_dlg;
static GtkWidget *gfpm_optimize_db_progressbar;
static GtkWidget *gfpm_optimize_db_startbtn;
@@ -49,11 +47,11 @@ static void gfpm_optimize_db (void);
void
gfpm_optimize_db_dlg_init (void)
{
- gfpm_optimize_db_dlg = glade_xml_get_widget (xml, "optimize_db_dlg");
- gfpm_optimize_db_progressbar = glade_xml_get_widget (xml,
"optimize_db_progress");
- gfpm_optimize_db_startbtn = glade_xml_get_widget (xml,
"optimize_db_start");
- gfpm_optimize_db_closebtn = glade_xml_get_widget (xml,
"optimize_db_close");
- gfpm_optimize_db_label = glade_xml_get_widget (xml,
"optimize_db_label");
+ gfpm_optimize_db_dlg = gfpm_get_widget ("optimize_db_dlg");
+ gfpm_optimize_db_progressbar = gfpm_get_widget ("optimize_db_progress");
+ gfpm_optimize_db_startbtn = gfpm_get_widget ("optimize_db_start");
+ gfpm_optimize_db_closebtn = gfpm_get_widget ("optimize_db_close");
+ gfpm_optimize_db_label = gfpm_get_widget ("optimize_db_label");
g_signal_connect (G_OBJECT(gfpm_optimize_db_startbtn),
"clicked",
diff --git a/src/gfpm-progress.c b/src/gfpm-progress.c
index 950a7de..d79a4da 100644
--- a/src/gfpm-progress.c
+++ b/src/gfpm-progress.c
@@ -24,16 +24,16 @@
#include <sys/time.h>
#include "gfpm.h"
#include "gfpm-progress.h"
+#include "gfpm-interface.h"
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
extern GtkWidget *gfpm_mw;
-extern GladeXML *xml;
GtkProgressBar *progressbar = NULL;
-GtkWidget *progresswindow = NULL;
+GtkWidget *progresswindow = NULL;
static GtkWidget *main_label = NULL;
static GtkWidget *sub_label = NULL;
static GtkWidget *rate_label = NULL;
@@ -68,18 +68,18 @@ gfpm_progress_init (void)
pacman_set_option (PM_OPT_DLRATE, (long)&rate);
pacman_set_option (PM_OPT_DLFNM, (long)reponame);
- progressbar = GTK_PROGRESS_BAR(glade_xml_get_widget (xml,
"progressbar1"));
- progresswindow = glade_xml_get_widget (xml, "progresswindow");
- main_label = glade_xml_get_widget (xml, "main_pr_label");
- sub_label = glade_xml_get_widget (xml, "sub_pr_label");
- rate_label = glade_xml_get_widget (xml, "rate_pr_label");
- rate_box = glade_xml_get_widget (xml, "rate_pr_box");
- rec_label = glade_xml_get_widget (xml, "rx_pr_label");
- progress_txtvw = glade_xml_get_widget (xml, "progress_txtvw");
- button_close = glade_xml_get_widget (xml, "close_progress");
- details_scroll = glade_xml_get_widget (xml, "details_scrollwindow");
- autoclose_checkbtn = glade_xml_get_widget (xml, "autoclose_checkbtn");
- g_signal_connect (G_OBJECT(glade_xml_get_widget(xml,"show_details")),
+ progressbar = GTK_PROGRESS_BAR(gfpm_get_widget ("progressbar1"));
+ progresswindow = gfpm_get_widget ("progresswindow");
+ main_label = gfpm_get_widget ("main_pr_label");
+ sub_label = gfpm_get_widget ("sub_pr_label");
+ rate_label = gfpm_get_widget ("rate_pr_label");
+ rate_box = gfpm_get_widget ("rate_pr_box");
+ rec_label = gfpm_get_widget ("rx_pr_label");
+ progress_txtvw = gfpm_get_widget ("progress_txtvw");
+ button_close = gfpm_get_widget ("close_progress");
+ details_scroll = gfpm_get_widget ("details_scrollwindow");
+ autoclose_checkbtn = gfpm_get_widget ("autoclose_checkbtn");
+ g_signal_connect (G_OBJECT(gfpm_get_widget("show_details")),
"toggled",
G_CALLBACK(cb_gfpm_details_button_toggled),
NULL);
diff --git a/src/gfpm-quickpane.c b/src/gfpm-quickpane.c
index 1b99388..9649231 100644
--- a/src/gfpm-quickpane.c
+++ b/src/gfpm-quickpane.c
@@ -48,14 +48,14 @@ static void cb_gfpm_quickpane_readme_clicked (GtkWidget
*button, gpointer data);
void
gfpm_quickpane_init (void)
{
- quick_pane_install_btn = glade_xml_get_widget (xml, "quick_install");
- quick_pane_remove_btn = glade_xml_get_widget (xml, "quick_remove");
- quick_pane_upgrade_btn = glade_xml_get_widget (xml, "quick_upgrade");
- quick_pane_readme_btn = glade_xml_get_widget (xml, "quick_readme");
- quick_pane_readme_dlg = glade_xml_get_widget (xml, "readme_dlg");
- quick_pane_readme_dlg_label = glade_xml_get_widget (xml,
"readme_dlg_label");
- quick_pane_readme_dlg_txtvw = glade_xml_get_widget (xml,
"readme_dlg_txtvw");
- quick_pane = glade_xml_get_widget (xml, "quick_pane");
+ quick_pane_install_btn = gfpm_get_widget ("quick_install");
+ quick_pane_remove_btn = gfpm_get_widget ("quick_remove");
+ quick_pane_upgrade_btn = gfpm_get_widget ("quick_upgrade");
+ quick_pane_readme_btn = gfpm_get_widget ("quick_readme");
+ quick_pane_readme_dlg = gfpm_get_widget ("readme_dlg");
+ quick_pane_readme_dlg_label = gfpm_get_widget ("readme_dlg_label");
+ quick_pane_readme_dlg_txtvw = gfpm_get_widget ("readme_dlg_txtvw");
+ quick_pane = gfpm_get_widget ("quick_pane");
gfpm_quickpane_show (FALSE, 0, 0);
g_signal_connect (G_OBJECT(quick_pane_install_btn),
"clicked",
diff --git a/src/gfpm-repomanager.c b/src/gfpm-repomanager.c
index 2c11248..949f7a4 100644
--- a/src/gfpm-repomanager.c
+++ b/src/gfpm-repomanager.c
@@ -20,13 +20,12 @@
#include "gfpm-repomanager.h"
#include "gfpm-messages.h"
+#include "gfpm-interface.h"
#include <glib.h>
#define CONF_FILE "/etc/pacman-g2.conf"
#define REPO_PATH "/etc/pacman-g2/repos"
-extern GladeXML *xml;
-
static gfpm_repolist_t *repolist = NULL;
static gchar *curr_repo = NULL;
@@ -59,20 +58,20 @@ gfpm_repomanager_init (void)
GtkCellRenderer *renderer = NULL;
GtkTreeViewColumn *column = NULL;
- gfpm_repomgr_dlg = glade_xml_get_widget (xml, "gfpm_repomanager");
- gfpm_repomgr_treeview = glade_xml_get_widget (xml, "repoman_listview");
- gfpm_repomgr_btnadd = glade_xml_get_widget (xml, "repoman_add");
- gfpm_repomgr_btndel = glade_xml_get_widget (xml, "repoman_del");
- gfpm_repomgr_btnedit = glade_xml_get_widget (xml, "repoman_edit");
- gfpm_repomgr_btnmup = glade_xml_get_widget (xml, "repoman_mup");
- gfpm_repomgr_btnmdn = glade_xml_get_widget (xml, "repoman_mdn");
- gfpm_servmgr_dlg = glade_xml_get_widget (xml,
"gfpm_repomanager_servermgr");
- gfpm_servmgr_treeview = glade_xml_get_widget (xml, "servman_listview");
- gfpm_servmgr_btnadd = glade_xml_get_widget (xml, "servman_add");
- gfpm_servmgr_btndel = glade_xml_get_widget (xml, "servman_del");
- gfpm_servmgr_btnedit = glade_xml_get_widget (xml, "servman_edit");
- gfpm_servmgr_btnmup = glade_xml_get_widget (xml, "servman_mup");
- gfpm_servmgr_btnmdn = glade_xml_get_widget (xml, "servman_mdn");
+ gfpm_repomgr_dlg = gfpm_get_widget ("gfpm_repomanager");
+ gfpm_repomgr_treeview = gfpm_get_widget ("repoman_listview");
+ gfpm_repomgr_btnadd = gfpm_get_widget ("repoman_add");
+ gfpm_repomgr_btndel = gfpm_get_widget ("repoman_del");
+ gfpm_repomgr_btnedit = gfpm_get_widget ("repoman_edit");
+ gfpm_repomgr_btnmup = gfpm_get_widget ("repoman_mup");
+ gfpm_repomgr_btnmdn = gfpm_get_widget ("repoman_mdn");
+ gfpm_servmgr_dlg = gfpm_get_widget ("gfpm_repomanager_servermgr");
+ gfpm_servmgr_treeview = gfpm_get_widget ("servman_listview");
+ gfpm_servmgr_btnadd = gfpm_get_widget ("servman_add");
+ gfpm_servmgr_btndel = gfpm_get_widget ("servman_del");
+ gfpm_servmgr_btnedit = gfpm_get_widget ("servman_edit");
+ gfpm_servmgr_btnmup = gfpm_get_widget ("servman_mup");
+ gfpm_servmgr_btnmdn = gfpm_get_widget ("servman_mdn");
/* setup repo store */
store = gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING);
@@ -166,7 +165,7 @@ gfpm_repomgr_populate_repolist (void)
if (fp == NULL)
{
g_error ("No configuration file found");
- return NULL;
+ return;
}
if (repolist!=NULL)
g_free (repolist);
@@ -175,7 +174,7 @@ gfpm_repomgr_populate_repolist (void)
if (repolist == NULL)
{
g_error ("Error allocating memory\n");
- return NULL;
+ return;
}
memset (repolist, 0, sizeof(gfpm_repolist_t));
while (fgets(line, PATH_MAX, fp))
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
