1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00

Added common module for glib compatibility

This commit is contained in:
James Booth 2012-05-19 21:56:23 +01:00
parent f533815832
commit 8c68fa0be5
4 changed files with 66 additions and 1 deletions

View File

@ -7,7 +7,7 @@ CPPLIB = -lstdc++
CFLAGS = -I ~/include -O3 $(WARNS) $(LIBS) `pkg-config --cflags glib-2.0` CFLAGS = -I ~/include -O3 $(WARNS) $(LIBS) `pkg-config --cflags glib-2.0`
OBJS = log.o windows.o title_bar.o status_bar.o input_win.o jabber.o \ OBJS = log.o windows.o title_bar.o status_bar.o input_win.o jabber.o \
profanity.o util.o command.o history.o contact_list.o prof_history.o \ profanity.o util.o command.o history.o contact_list.o prof_history.o \
contact.o preferences.o prof_autocomplete.o main.o contact.o preferences.o prof_autocomplete.o common.o main.o
TESTOBJS = test_contact_list.o contact_list.o contact.o \ TESTOBJS = test_contact_list.o contact_list.o contact.o \
test_util.o test_prof_history.o prof_history.o util.o \ test_util.o test_prof_history.o prof_history.o util.o \
test_prof_autocomplete.o prof_autocomplete.o test_prof_autocomplete.o prof_autocomplete.o
@ -15,6 +15,7 @@ TESTOBJS = test_contact_list.o contact_list.o contact.o \
profanity: $(OBJS) profanity: $(OBJS)
$(CC) -o profanity $(OBJS) $(LIBS) $(CC) -o profanity $(OBJS) $(LIBS)
common.o: common.h
log.o: log.h log.o: log.h
windows.o: windows.h util.h contact_list.h preferences.h windows.o: windows.h util.h contact_list.h preferences.h
title_bar.o: windows.h title_bar.o: windows.h

29
common.c Normal file
View File

@ -0,0 +1,29 @@
/*
* common.c
*
* Copyright (C) 2012 James Booth <boothj5@gmail.com>
*
* This file is part of Profanity.
*
* Profanity 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 3 of the License, or
* (at your option) any later version.
*
* Profanity is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Profanity. If not, see <http://www.gnu.org/licenses/>.
*
*/
#include <glib.h>
void p_slist_free_full(GSList *items, GDestroyNotify free_func)
{
g_slist_foreach (items, (GFunc) free_func, NULL);
g_slist_free (items);
}

34
common.h Normal file
View File

@ -0,0 +1,34 @@
/*
* common.h
*
* Copyright (C) 2012 James Booth <boothj5@gmail.com>
*
* This file is part of Profanity.
*
* Profanity 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 3 of the License, or
* (at your option) any later version.
*
* Profanity is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Profanity. If not, see <http://www.gnu.org/licenses/>.
*
*/
#ifndef COMMON_H
#define COMMON_H
#include <glib.h>
#if !GLIB_CHECK_VERSION(2,28,0)
#define g_slist_free_full(items, free_func) p_slist_free_full(items, free_func)
#endif
void p_slist_free_full(GSList *items, GDestroyNotify free_func);
#endif

View File

@ -25,6 +25,7 @@
#include <glib.h> #include <glib.h>
#include "common.h"
#include "prof_autocomplete.h" #include "prof_autocomplete.h"
struct p_autocomplete_t { struct p_autocomplete_t {