[ekiga] Moved the dialpad widget code as pure C in lib/gui



commit 650da2be82b6ad11a4fd190a2dc7b282703651a7
Author: Snark <jpuydt gnome org>
Date:   Thu Oct 21 21:07:54 2010 +0200

    Moved the dialpad widget code as pure C in lib/gui
    
    Apart from two little things, it was already almost pure C/gtk+, so it
    was natural to push it where the other such widgets were!

 lib/Makefile.am                          |    2 ++
 src/gui/dialpad.cpp => lib/gui/dialpad.c |    4 ++--
 {src => lib}/gui/dialpad.h               |    0
 src/Makefile.am                          |    2 --
 4 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 864c4fd..cc98d0b 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -155,6 +155,8 @@ endif
 # (those should probably be moved elsewhere like lib/engine/gui/gtk-core/ )
 ##
 libekiga_la_SOURCES += \
+	$(top_srcdir)/lib/gui/dialpad.h \
+	$(top_srcdir)/lib/gui/dialpad.c \
 	$(top_srcdir)/lib/gui/gm-smileys.h \
 	$(top_srcdir)/lib/gui/gm-smileys.c \
 	$(top_srcdir)/lib/gui/gmwindow.c \
diff --git a/src/gui/dialpad.cpp b/lib/gui/dialpad.c
similarity index 98%
rename from src/gui/dialpad.cpp
rename to lib/gui/dialpad.c
index f3a4c88..0232758 100644
--- a/src/gui/dialpad.cpp
+++ b/lib/gui/dialpad.c
@@ -149,7 +149,7 @@ ekiga_dialpad_init (EkigaDialpad *dialpad)
 
   gtk_table_set_col_spacings (GTK_TABLE (dialpad), 2);
   gtk_table_set_row_spacings (GTK_TABLE (dialpad), 2);
-  gtk_table_set_homogeneous (GTK_TABLE (dialpad), true);
+  gtk_table_set_homogeneous (GTK_TABLE (dialpad), TRUE);
 
   /* Create the buttons */
   for (i = 0; i < G_N_ELEMENTS (keys_info); i++) {
@@ -273,7 +273,7 @@ ekiga_dialpad_class_init (EkigaDialpadClass *klass)
 }
 
 guint
-ekiga_dialpad_get_button_code (EkigaDialpad * /* dialpad */,
+ekiga_dialpad_get_button_code (G_GNUC_UNUSED EkigaDialpad *dialpad,
                                char          number)
 {
   unsigned i;
diff --git a/src/gui/dialpad.h b/lib/gui/dialpad.h
similarity index 100%
rename from src/gui/dialpad.h
rename to lib/gui/dialpad.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 513f173..d98b6a1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -62,8 +62,6 @@ ekiga_SOURCES +=			\
 	gui/callbacks.cpp		\
 	gui/conf.h			\
 	gui/conf.cpp			\
-	gui/dialpad.h			\
-	gui/dialpad.cpp			\
 	gui/assistant.h			\
 	gui/assistant.cpp		\
 	gui/main_window.h		\



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]