aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Woodward2005-08-24 21:30:01 +0000
committerJason Woodward2005-08-24 21:30:01 +0000
commit7de1e6ceecf34388be49c8e4c89aeffb45e3fe16 (patch)
treef132b230c5859383d0b322b914d2fccf57fc10a8
parentf391ff1a71371cf4ccdbde3c6cd6b1d52048d84f (diff)
downloadgslapt-7de1e6ceecf34388be49c8e4c89aeffb45e3fe16.tar.gz
requires libslapt 0.9.10c
-rw-r--r--ChangeLog1
-rw-r--r--configure.in2
-rw-r--r--slack-required2
-rw-r--r--src/callbacks.c33
4 files changed, 3 insertions, 35 deletions
diff --git a/ChangeLog b/ChangeLog
index 384e11c..fb013bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
0.3.6 Aug 24, 2005
+ * requires libslapt 0.9.10c
* initial support for disabling package sources
* make sure that --config [] is always honored when editing preferences
* set busy cursor whenever resetting package attributes in package view
diff --git a/configure.in b/configure.in
index 06832f9..90b46d9 100644
--- a/configure.in
+++ b/configure.in
@@ -20,7 +20,7 @@ AC_CHECK_HEADER(curl/curl.h, [], [AC_MSG_ERROR(libcurl headers are missing)])
AC_CHECK_HEADER(slapt.h, [], [AC_MSG_ERROR(libslapt headers are missing)])
AC_CHECK_LIB(z,gzopen, [LIBS="$LIBS -lz"], [AC_MSG_ERROR(libz is missing)])
AC_CHECK_LIB(curl,curl_global_init, [LIBS="$LIBS `curl-config --libs`"], [AC_MSG_ERROR(curl libs are missing)])
-AC_CHECK_LIB(slapt,slapt_get_md5sums, [], [AC_MSG_ERROR(libslapt 0.9.10b or greater is required)])
+AC_CHECK_LIB(slapt,slapt_remove_source, [], [AC_MSG_ERROR(libslapt 0.9.10c or greater is required)])
LIBS="$LIBS -lglib-2.0 -lgthread-2.0"
pkg_modules="gtk+-2.0 >= 2.4.0"
diff --git a/slack-required b/slack-required
index a5a6583..d60d51d 100644
--- a/slack-required
+++ b/slack-required
@@ -6,4 +6,4 @@ x11 >= 6.7.0-i486-4
gtk+2 >= 2.4.10-i486-1
atk >= 1.6.1-i486-1
pango >= 1.4.0-i486-1
-slapt-get >= 0.9.10b-i386-1
+slapt-get >= 0.9.10c-i386-1
diff --git a/src/callbacks.c b/src/callbacks.c
index be9e365..baf70fc 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -71,7 +71,6 @@ static void reset_search_list (void);
static int ladd_deps_to_trans (slapt_transaction_t *tran, struct slapt_pkg_list *avail_pkgs,
struct slapt_pkg_list *installed_pkgs, slapt_pkg_info_t *pkg);
static gboolean toggle_source_status (GtkTreeView *treeview, gpointer data);
-static void slapt_remove_source (struct slapt_source_list *list, const char *s);
void on_gslapt_destroy (GtkObject *object, gpointer user_data)
{
@@ -2828,35 +2827,3 @@ static gboolean toggle_source_status (GtkTreeView *treeview, gpointer data)
}
}
-static void slapt_remove_source (struct slapt_source_list *list, const char *s)
-{
- gchar *tmp = NULL;
- guint i = 0;
-
- while ( i < list->count ) {
- if ( strcmp(s,list->url[i]) == 0 && tmp == NULL ) {
- tmp = list->url[i];
- }
- if ( tmp != NULL && (i+1 < list->count) ) {
- list->url[i] = list->url[i + 1];
- }
- ++i;
- }
- if ( tmp != NULL ) {
- char **realloc_tmp;
- int count = list->count - 1;
- if ( count < 1 ) count = 1;
-
- free(tmp);
-
- realloc_tmp = realloc(list->url,sizeof *list->url * count );
- if ( realloc_tmp != NULL ) {
- list->url = realloc_tmp;
- if (list->count > 0)
- --list->count;
- }
-
- }
-
-}
-