reformat:method-declaration.regex vim-enhanced.session.tcsh @@ -1 +1 @@ -/profile.d/templates/New project documents/COPYING \ No newline at end of file +/profile.d/templates/gtk-programming/project-docs/COPYING \ No newline at end of file COPYING @@ -3,5 +3,5 @@ - Polish existing features, before adding more! - After initial timeline retrieval, only retrieve tweets since last retrieval, and append those to the gtk_list_store -- [in progress] Memory profiling of Twitux, it's leaking pretty bad. +- Add valgrind suppor Greet-Tweet-Know. TODO @@ -1,6 +1,6 @@ @%:@! /bin/sh @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.61 for Twitux 0.69. +@%:@ Generated by GNU Autoconf 2.61 for Greet-Tweet-Know 0.69. @%:@ @%:@ Report bugs to <http://sourceforge.net/tracker/?func=add&group_id=198704&atid=966542>. @%:@ @@ -728,10 +728,10 @@ MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. -PACKAGE_NAME='Twitux' +PACKAGE_NAME='Greet-Tweet-Know' PACKAGE_TARNAME='twitux' PACKAGE_VERSION='0.69' -PACKAGE_STRING='Twitux 0.69' +PACKAGE_STRING='Greet-Tweet-Know 0.69' PACKAGE_BUGREPORT='http://sourceforge.net/tracker/?func=add&group_id=198704&atid=966542' ac_unique_file="src/twitux-main.c" @@ -1488,7 +1488,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Twitux 0.69 to adapt to many kinds of systems. +\`configure' configures Greet-Tweet-Know 0.69 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1558,7 +1558,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Twitux 0.69:";; + short | recursive ) echo "Configuration of Greet-Tweet-Know 0.69:";; esac cat <<\_ACEOF @@ -1703,7 +1703,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Twitux configure 0.69 +Greet-Tweet-Know configure 0.69 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1719,7 +1719,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Twitux $as_me 0.69, which was +It was created by Greet-Tweet-Know $as_me 0.69, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -25829,7 +25829,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Twitux $as_me 0.69, which was +This file was extended by Greet-Tweet-Know $as_me 0.69, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25882,7 +25882,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -Twitux config.status 0.69 +Greet-Tweet-Know config.status 0.69 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" autom4te.cache/output.0 @@ -1,6 +1,6 @@ @%:@! /bin/sh @%:@ Guess values for system-dependent variables and create Makefiles. -@%:@ Generated by GNU Autoconf 2.61 for Twitux 0.69. +@%:@ Generated by GNU Autoconf 2.61 for Greet-Tweet-Know 0.69. @%:@ @%:@ Report bugs to <http://sourceforge.net/tracker/?func=add&group_id=198704&atid=966542>. @%:@ @@ -728,10 +728,10 @@ MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. -PACKAGE_NAME='Twitux' +PACKAGE_NAME='Greet-Tweet-Know' PACKAGE_TARNAME='twitux' PACKAGE_VERSION='0.69' -PACKAGE_STRING='Twitux 0.69' +PACKAGE_STRING='Greet-Tweet-Know 0.69' PACKAGE_BUGREPORT='http://sourceforge.net/tracker/?func=add&group_id=198704&atid=966542' ac_unique_file="src/twitux-main.c" @@ -1488,7 +1488,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Twitux 0.69 to adapt to many kinds of systems. +\`configure' configures Greet-Tweet-Know 0.69 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1558,7 +1558,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Twitux 0.69:";; + short | recursive ) echo "Configuration of Greet-Tweet-Know 0.69:";; esac cat <<\_ACEOF @@ -1703,7 +1703,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Twitux configure 0.69 +Greet-Tweet-Know configure 0.69 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1719,7 +1719,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Twitux $as_me 0.69, which was +It was created by Greet-Tweet-Know $as_me 0.69, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -25817,7 +25817,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Twitux $as_me 0.69, which was +This file was extended by Greet-Tweet-Know $as_me 0.69, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25870,7 +25870,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -Twitux config.status 0.69 +Greet-Tweet-Know config.status 0.69 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" autom4te.cache/output.1 @@ -1,6 +1,6 @@ m4trace:aclocal.m4:8576: -1- m4_include([m4/gnome-doc-utils.m4]) m4trace:aclocal.m4:8577: -1- m4_include([m4/intltool.m4]) -m4trace:configure.in:1: -1- AC_INIT([Twitux], [0.69], [http://sourceforge.net/tracker/?func=add&group_id=198704&atid=966542], [twitux]) +m4trace:configure.in:1: -1- AC_INIT([Greet-Tweet-Know], [0.69], [http://sourceforge.net/tracker/?func=add&group_id=198704&atid=966542], [twitux]) m4trace:configure.in:1: -1- m4_pattern_forbid([^_?A[CHUM]_]) m4trace:configure.in:1: -1- m4_pattern_forbid([_AC_]) m4trace:configure.in:1: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS']) autom4te.cache/traces.1 @@ -1,4 +1,4 @@ -AC_INIT([g-greet], [0.1.0.2], [http://uberChicGeekChick.Com/?projects=Greet-Tweet-Know], [greet-tweet-know]) +AC_INIT([greet-tweet-know], [0.1.0.2], [http://uberChicGeekChick.Com/?projects=Greet-Tweet-Know], [greet-tweet-know]) AC_PREREQ(2.59) AC_COPYRIGHT([Copyright (C) 2009 Kaity G. B.]) configure.in @@ -310,6 +310,7 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs + install-desktopDATA: $(desktop_DATA) @$(NORMAL_INSTALL) test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)" @@ -327,6 +328,7 @@ uninstall-desktopDATA: echo " rm -f '$(DESTDIR)$(desktopdir)/$$f'"; \ rm -f "$(DESTDIR)$(desktopdir)/$$f"; \ done + install-gladeDATA: $(glade_DATA) @$(NORMAL_INSTALL) test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)" data/Makefile.in @@ -162,14 +162,27 @@ <property name="use_underline">True</property> <child> <widget class="GtkMenu" id="view1_menu"> - <child> - <widget class="GtkRadioMenuItem" id="view_public_timeline"> + <child> + <widget class="GtkRadioMenuItem" id="view_combined_timeline"> + <property name="visible">True</property> + <property name="label" translatable="yes">_My Combined Tweets</property> + <property name="use_underline">True</property> + <property name="group">view_public_timeline</property> + </widget> + </child> + <child> + <child> + <widget class="GtkSeparatorMenuItem" id="separator7"> + <property name="visible">True</property> + </widget> + </child> + <widget class="GtkRadioMenuItem" id="view_public_timeline"> <property name="visible">True</property> - <property name="label" translatable="yes">Public Timeline</property> + <property name="label" translatable="yes">_Every one's Tweets</property> <property name="use_underline">True</property> </widget> </child> - <child> + <child> <widget class="GtkRadioMenuItem" id="view_friends_timeline"> <property name="visible">True</property> <property name="label" translatable="yes">Friends Timeline</property> @@ -178,7 +191,7 @@ <property name="group">view_public_timeline</property> </widget> </child> - <child> + <child> <widget class="GtkRadioMenuItem" id="view_my_timeline"> <property name="visible">True</property> <property name="label" translatable="yes">My Timeline</property> @@ -203,7 +216,7 @@ </widget> </child> <child> - <widget class="GtkSeparatorMenuItem" id="separator7"> + <widget class="GtkSeparatorMenuItem" id="separator8"> <property name="visible">True</property> </widget> </child> data/glade/main_window.glade @@ -1,5 +1,4 @@ <?xml version="1.0"?> -<!--*- mode: xml -*--> <interface> <object class="GtkUIManager" id="uimanager1"> <child> @@ -51,7 +50,7 @@ <property name="name">twitter_refresh</property> <property name="label" translatable="yes">_Refresh</property> </object> - <accelerator key="F5" modifiers="0"/> + <accelerator key="F5"/> </child> <child> <object class="GtkAction" id="twitter_quit"> @@ -70,7 +69,7 @@ <property name="name">settings_account</property> <property name="label" translatable="yes">_Account</property> </object> - <accelerator key="F4" modifiers="0"/> + <accelerator key="F4"/> </child> <child> <object class="GtkAction" id="settings_preferences"> @@ -85,14 +84,21 @@ </object> </child> <child> + <object class="GtkRadioAction" id="view_combined_timeline"> + <property name="group">view_public_timeline</property> + <property name="name">view_combined_timeline</property> + <property name="label" translatable="yes">_My Combined Tweets</property> + </object> + </child> + <child> <object class="GtkRadioAction" id="view_public_timeline"> <property name="name">view_public_timeline</property> - <property name="label" translatable="yes">Public Timeline</property> + <property name="label" translatable="yes">_Every one's Tweets</property> </object> </child> <child> <object class="GtkRadioAction" id="view_friends_timeline"> - <property name="value">1</property> + <property name="active">True</property> <property name="group">view_public_timeline</property> <property name="name">view_friends_timeline</property> <property name="label" translatable="yes">Friends Timeline</property> @@ -137,7 +143,7 @@ <property name="name">help_contents</property> <property name="label" translatable="yes">_Contents</property> </object> - <accelerator key="F1" modifiers="0"/> + <accelerator key="F1"/> </child> <child> <object class="GtkAction" id="help_about"> @@ -167,6 +173,7 @@ <menuitem action="settings_preferences"/> </menu> <menu action="view1"> + <menuitem action="view_combined_timeline"/> <menuitem action="view_public_timeline"/> <menuitem action="view_friends_timeline"/> <menuitem action="view_my_timeline"/> @@ -187,31 +194,14 @@ <property name="height_request">320</property> <property name="visible">True</property> <property name="title" translatable="yes">Greet-Tweet-Know</property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</property> - <property name="resizable">True</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - <property name="urgency_hint">False</property> <child> <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> <child> <object class="GtkMenuBar" constructor="uimanager1" id="main_menubar"> <property name="visible">True</property> - <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property> - <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property> </object> <packing> - <property name="padding">0</property> <property name="expand">False</property> <property name="fill">False</property> </packing> @@ -221,95 +211,68 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">GTK_POLICY_NEVER</property> - <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property> <property name="shadow_type">GTK_SHADOW_IN</property> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property> <child> <placeholder/> </child> </object> <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="position">1</property> </packing> </child> <child> <object class="GtkHBox" id="expand_box"> <property name="visible">True</property> - <property name="homogeneous">False</property> <property name="spacing">1</property> <child> <object class="GtkImage" id="expand_image"> <property name="visible">True</property> - <property name="stock">gtk-missing-image</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> <property name="yalign">0</property> <property name="xpad">7</property> <property name="ypad">5</property> + <property name="stock">gtk-missing-image</property> </object> <packing> - <property name="padding">0</property> <property name="expand">False</property> - <property name="fill">True</property> </packing> </child> <child> <object class="GtkVBox" id="expand_vbox"> <property name="visible">True</property> - <property name="homogeneous">False</property> <property name="spacing">2</property> <child> <object class="GtkLabel" id="expand_title"> <property name="visible">True</property> - <property name="label" translatable="yes"/> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> <property name="xalign">0</property> - <property name="yalign">0.5</property> <property name="xpad">5</property> <property name="ypad">3</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> + <property name="use_markup">True</property> </object> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> </child> <child> <placeholder/> </child> </object> <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> <packing> - <property name="padding">6</property> <property name="expand">False</property> <property name="fill">False</property> + <property name="padding">6</property> + <property name="position">2</property> </packing> </child> <child> <object class="GtkStatusbar" id="main_statusbar"> <property name="visible">True</property> - <property name="has_resize_grip">True</property> </object> <packing> - <property name="padding">0</property> <property name="expand">False</property> <property name="fill">False</property> + <property name="position">3</property> </packing> </child> </object> data/main_window.xml @@ -12,7 +12,7 @@ </date> <subject category="GNOME|Applications|Internet"/> <description> - User manual for Twitux Twitter Client. + User manual for Greet-Tweet-Know Twitter Client. </description> <type> user's guide help/C/greet-tweet-know-C.omf @@ -36,23 +36,23 @@ typedef struct { GtkWidget *username; GtkWidget *password; GtkWidget *show_password; -} TwituxAccount; +} Account; static void account_response_cb (GtkWidget *widget, gint response, - TwituxAccount *act); + Account *act); static void account_destroy_cb (GtkWidget *widget, - TwituxAccount *act); + Account *act); static void account_show_password_cb (GtkWidget *widget, - TwituxAccount *act); + Account *act); static void account_response_cb (GtkWidget *widget, gint response, - TwituxAccount *act) + Account *act) { if (response == GTK_RESPONSE_OK) { - TwituxConf *conf; + Conf *conf; conf = conf_get (); @@ -74,14 +74,14 @@ account_response_cb (GtkWidget *widget, static void account_destroy_cb (GtkWidget *widget, - TwituxAccount *act) + Account *act) { g_free (act); } static void account_show_password_cb (GtkWidget *widget, - TwituxAccount *act) + Account *act) { gboolean visible; @@ -92,9 +92,9 @@ account_show_password_cb (GtkWidget *widget, void account_dialog_show (GtkWindow *parent) { - static TwituxAccount *act; + static Account *act; GtkBuilder *ui; - TwituxConf *conf; + Conf *conf; gchar *username; gchar *password; @@ -103,7 +103,7 @@ account_dialog_show (GtkWindow *parent) return; } - act = g_new0 (TwituxAccount, 1); + act = g_new0 (Account, 1); /* Get widgets */ ui = glade_get_file (GLADE_FILE, src/account-dialog.c @@ -31,18 +31,18 @@ typedef struct { GtkWidget *entry; GtkWidget *dialog; -} TwituxAdd; +} Add; static void add_response_cb (GtkWidget *widget, gint response, - TwituxAdd *add); + Add *add); static void add_destroy_cb (GtkWidget *widget, - TwituxAdd *add); + Add *add); static void add_response_cb (GtkWidget *widget, gint response, - TwituxAdd *add) + Add *add) { if (response == GTK_RESPONSE_OK) { network_add_user (gtk_entry_get_text (GTK_ENTRY (add->entry))); @@ -52,7 +52,7 @@ add_response_cb (GtkWidget *widget, static void add_destroy_cb (GtkWidget *widget, - TwituxAdd *add) + Add *add) { g_free (add); } @@ -60,7 +60,7 @@ add_destroy_cb (GtkWidget *widget, void add_dialog_show (GtkWindow *parent) { - static TwituxAdd *add; + static Add *add; GtkBuilder *ui; if (add) { @@ -68,7 +68,7 @@ add_dialog_show (GtkWindow *parent) return; } - add = g_new0 (TwituxAdd, 1); + add = g_new0 (Add, 1); /* Get widgets */ ui = glade_get_file (GLADE_FILE, src/add-dialog.c @@ -57,7 +57,7 @@ #include <dbus/dbus-glib.h> #endif -#define GET_PRIV(obj)(G_TYPE_INSTANCE_GET_PRIVATE((obj), TYPE_APP, TwituxAppPriv )) +#define GET_PRIV(obj)(G_TYPE_INSTANCE_GET_PRIVATE((obj), TYPE_APP, AppPriv )) #define DEBUG_DOMAIN_SETUP "AppSetup" #define GLADE_FILE "main_window.xml" @@ -65,10 +65,10 @@ #define TYPE_TWITTER "twitter" -struct _TwituxAppPriv { +struct _AppPriv { /* Main widgets */ GtkWidget *window; - TwituxTweetList *listview; + TweetList *listview; GtkWidget *statusbar; /* @@ -80,6 +80,7 @@ struct _TwituxAppPriv { /* Timeline menu items */ GSList *group; + GtkRadioAction *menu_combined; GtkRadioAction *menu_public; GtkRadioAction *menu_friends; GtkRadioAction *menu_mine; @@ -108,88 +109,70 @@ struct _TwituxAppPriv { /* Expand messages widgets */ GtkWidget *expand_box; GtkWidget *expand_image; - GtkWidget *expand_title; +GtkWidget *expand_title; GtkWidget *expand_label; }; -static void app_class_init (TwituxAppClass *klass); -static void app_init (TwituxApp *app); +static void app_class_init (AppClass *klass); +static void app_init (App *app); static void app_finalize(GObject *object); static void restore_main_window_geometry(GtkWidget *main_window); static void on_accounts_destroy(DBusGProxy *proxy, - TwituxApp *app); -static void disconnect(TwituxApp *app); -static void reconnect(TwituxApp *app); + App *app); +static void disconnect(App *app); +static void reconnect(App *app); static gboolean update_account(DBusGProxy *account, - TwituxApp *app, + App *app, GError **error); -static void on_account_changed(DBusGProxy *account, - TwituxApp *app); + +static void on_account_changed(DBusGProxy *account, App *app); static void on_account_disabled(DBusGProxy *accounts, const char *opath, - TwituxApp *app); + App *app); static void on_account_enabled(DBusGProxy *accounts, const char *opath, - TwituxApp *app); + App *app); static void app_setup(void); -static void main_window_destroy_cb(GtkWidget *window, - TwituxApp *app); +static void main_window_destroy_cb(GtkWidget *window, App *app); static gboolean main_window_delete_event_cb(GtkWidget *window, GdkEvent *event, - TwituxApp *app); -static void app_set_radio_group(TwituxApp *app, - GtkBuilder *ui); -static void app_connect_cb(GtkWidget *window, - TwituxApp *app); -static void app_disconnect_cb(GtkWidget *window, - TwituxApp *app); -static void app_new_message_cb(GtkWidget *window, - TwituxApp *app); -static void app_send_direct_message_cb(GtkWidget *window, - TwituxApp *app); -static void app_quit_cb(GtkWidget *window, - TwituxApp *app); -static void app_refresh_cb(GtkWidget *window, - TwituxApp *app); -static void app_account_cb(GtkWidget *window, - TwituxApp *app); -static void app_preferences_cb(GtkWidget *window, - TwituxApp *app); -static void app_public_timeline_cb(GtkRadioAction *action, - GtkRadioAction *current, - TwituxApp *app); + App *app); +static void app_set_radio_group(App *app, GtkBuilder *ui); +static void app_connect_cb(GtkWidget *window, App *app); +static void app_disconnect_cb(GtkWidget *window, App *app); +static void app_new_message_cb(GtkWidget *window, App *app); +static void app_send_direct_message_cb(GtkWidget *window, App *app); +static void app_quit_cb(GtkWidget *window, App *app); +static void app_refresh_cb(GtkWidget *window, App *app); +static void app_account_cb(GtkWidget *window, App *app); +static void app_preferences_cb(GtkWidget *window, App *app); +static void app_combined_timeline_cb(GtkRadioAction *action, GtkRadioAction *current, App *app); +static void app_public_timeline_cb(GtkRadioAction *action, GtkRadioAction *current, App *app); static void app_friends_timeline_cb(GtkRadioAction *action, GtkRadioAction *current, - TwituxApp *app); + App *app); static void app_mine_timeline_cb(GtkRadioAction *action, GtkRadioAction *current, - TwituxApp *app); + App *app); static void app_view_direct_messages_cb(GtkRadioAction *action, GtkRadioAction *current, - TwituxApp *app); + App *app); static void app_view_direct_replies_cb(GtkRadioAction *action, GtkRadioAction *current, - TwituxApp *app); -static void app_view_friends_cb(GtkAction *action, - TwituxApp *app); -static void app_about_cb(GtkWidget *window, - TwituxApp *app); -static void app_help_contents_cb(GtkWidget *widget, - TwituxApp *app); -static void app_status_icon_activate_cb(GtkStatusIcon *status_icon, - TwituxApp *app); + App *app); +static void app_view_friends_cb(GtkAction *action, App *app); +static void app_about_cb(GtkWidget *window, App *app); +static void app_help_contents_cb(GtkWidget *widget, App *app); +static void app_status_icon_activate_cb(GtkStatusIcon *status_icon, App *app); static void app_status_icon_popup_menu_cb(GtkStatusIcon *status_icon, guint button, guint activate_time, - TwituxApp *app); -static gboolean request_accounts(TwituxApp *a, GError **error); -static void app_add_friend_cb(GtkAction *menuitem, - TwituxApp *app); -static void app_connection_items_setup(TwituxApp *app, - GtkBuilder *ui); -static void app_login(TwituxApp *app); -static void app_set_default_timeline(TwituxApp *app, - gchar *timeline); + App *app); +static gboolean request_accounts(App *a, GError **error); +static void app_add_friend_cb(GtkAction *menuitem, App *app); +static void app_connection_items_setup(App *app, GtkBuilder *ui); +static void app_login(App *app); +static void app_set_default_timeline(App *app, gchar *timeline); static void app_retrieve_default_timeline(void); static void app_status_icon_create_menu(void); static void app_status_icon_create(void); @@ -198,27 +181,27 @@ static void app_toggle_visibility(void); static gboolean configure_event_timeout_cb(GtkWidget *widget); static gboolean app_window_configure_event_cb(GtkWidget *widget, GdkEventConfigure *event, - TwituxApp *app); + App *app); -static TwituxApp *app = NULL; -static TwituxAppPriv *app_priv=NULL; +static App *app = NULL; +static AppPriv *app_priv=NULL; -G_DEFINE_TYPE(TwituxApp, app, G_TYPE_OBJECT); +G_DEFINE_TYPE(App, app, G_TYPE_OBJECT); static void -app_class_init(TwituxAppClass *klass) +app_class_init(AppClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS(klass); object_class->finalize = app_finalize; - g_type_class_add_private(object_class, sizeof(TwituxAppPriv)); + g_type_class_add_private(object_class, sizeof(AppPriv)); } static void -app_init(TwituxApp *singleton_app) +app_init(App *singleton_app) { - //TwituxAppPriv *priv; + //AppPriv *priv; app = singleton_app; app_priv=GET_PRIV(app); @@ -230,8 +213,8 @@ app_init(TwituxApp *singleton_app) static void app_finalize(GObject *object) { - TwituxApp *app; - //TwituxAppPriv *priv; + App *app; + //AppPriv *priv; app = APP(object); app_priv = GET_PRIV(app); @@ -260,14 +243,14 @@ restore_main_window_geometry(GtkWidget *main_window) } static void -on_accounts_destroy(DBusGProxy *proxy, TwituxApp *app) +on_accounts_destroy(DBusGProxy *proxy, App *app) { app_priv->account = NULL; app_priv->accounts_service = NULL; } static void -disconnect(TwituxApp *app) +disconnect(App *app) { GtkListStore *store = tweet_list_get_store(); gtk_list_store_clear(store); @@ -276,9 +259,9 @@ disconnect(TwituxApp *app) } static void -reconnect(TwituxApp *app) +reconnect(App *app) { - TwituxConf *conf; + Conf *conf; gboolean login; disconnect(app); @@ -297,7 +280,7 @@ reconnect(TwituxApp *app) static gboolean update_account(DBusGProxy *account, - TwituxApp *app, + App *app, GError **error) { gchar *username; @@ -347,7 +330,7 @@ return TRUE; static void on_account_changed(DBusGProxy *account, - TwituxApp *app) + App *app) { GError *error = NULL; @@ -370,7 +353,7 @@ return; static void on_account_disabled(DBusGProxy *accounts, const char *opath, - TwituxApp *app) + App *app) { GError *error = NULL; @@ -392,7 +375,7 @@ return; static void on_account_enabled(DBusGProxy *accounts, const char *opath, - TwituxApp *app) + App *app) { GError *error = NULL; @@ -420,7 +403,7 @@ on_account_enabled(DBusGProxy *accounts, static void app_setup(void) { - TwituxConf *conf; + Conf *conf; GtkBuilder *ui; GtkWidget *scrolled_window; GtkWidget *expand_vbox; @@ -441,6 +424,7 @@ app_setup(void) "main_window", &app_priv->window, "main_scrolledwindow", &scrolled_window, "main_statusbar", &app_priv->statusbar, + "view_combined_timeline", &app_priv->menu_combined, "view_public_timeline", &app_priv->menu_public, "view_friends_timeline", &app_priv->menu_friends, "view_my_timeline", &app_priv->menu_mine, @@ -483,6 +467,7 @@ app_setup(void) "twitter_add_friend", "activate", app_add_friend_cb, "settings_account", "activate", app_account_cb, "settings_preferences", "activate", app_preferences_cb, + "view_combined_timeline", "changed", app_combined_timeline_cb, "view_public_timeline", "changed", app_public_timeline_cb, "view_friends_timeline", "changed", app_friends_timeline_cb, "view_my_timeline", "changed", app_mine_timeline_cb, @@ -601,7 +586,7 @@ app_setup(void) } static void -main_window_destroy_cb(GtkWidget *window, TwituxApp *app) +main_window_destroy_cb(GtkWidget *window, App *app) { /* Add any clean-up code here */ #ifdef DEBUG_QUIT @@ -614,7 +599,7 @@ main_window_destroy_cb(GtkWidget *window, TwituxApp *app) static gboolean main_window_delete_event_cb(GtkWidget *window, GdkEvent *event, - TwituxApp *app) + App *app) { if(gtk_status_icon_is_embedded(app_priv->status_icon)) { @@ -656,7 +641,7 @@ return FALSE; } static void -app_set_radio_group(TwituxApp *app, +app_set_radio_group(App *app, GtkBuilder *ui) { GtkRadioAction *w; @@ -728,21 +713,21 @@ app_set_visibility(gboolean visible) static void app_connect_cb(GtkWidget *widget, - TwituxApp *app) + App *app) { app_login(app); } static void app_disconnect_cb(GtkWidget *widget, - TwituxApp *app) + App *app) { disconnect(app); } static void app_new_message_cb(GtkWidget *widget, - TwituxApp *app) + App *app) { @@ -752,7 +737,7 @@ app_new_message_cb(GtkWidget *widget, static void app_send_direct_message_cb(GtkWidget *widget, - TwituxApp *app) + App *app) { @@ -762,7 +747,7 @@ app_send_direct_message_cb(GtkWidget *widget, static void app_quit_cb(GtkWidget *widget, - TwituxApp *app) + App *app) { @@ -771,26 +756,26 @@ app_quit_cb(GtkWidget *widget, static void app_refresh_cb(GtkWidget *window, - TwituxApp *app) + App *app) { network_refresh(); } -static void -app_public_timeline_cb(GtkRadioAction *action, - GtkRadioAction *current, - TwituxApp *app) -{ - +static void app_combined_timeline_cb(GtkRadioAction *action, GtkRadioAction *current, App *app){ + if(current!=app_priv->menu_combined) return; + network_get_combined_timeline(); +} + +static void app_public_timeline_cb(GtkRadioAction *action, GtkRadioAction *current, App *app){ if(app_priv->menu_public == current) network_get_timeline(API_TWITTER_TIMELINE_PUBLIC); } - + static void app_friends_timeline_cb(GtkRadioAction *action, GtkRadioAction *current, - TwituxApp *app) + App *app) { @@ -801,7 +786,7 @@ app_friends_timeline_cb(GtkRadioAction *action, static void app_mine_timeline_cb(GtkRadioAction *action, GtkRadioAction *current, - TwituxApp *app) + App *app) { @@ -812,7 +797,7 @@ app_mine_timeline_cb(GtkRadioAction *action, static void app_view_direct_messages_cb(GtkRadioAction *action, GtkRadioAction *current, - TwituxApp *app) + App *app) { @@ -823,7 +808,7 @@ app_view_direct_messages_cb(GtkRadioAction *action, static void app_view_direct_replies_cb(GtkRadioAction *action, GtkRadioAction *current, - TwituxApp *app) + App *app) { @@ -833,13 +818,13 @@ app_view_direct_replies_cb(GtkRadioAction *action, static void app_view_friends_cb(GtkAction *action, - TwituxApp *app) + App *app) { lists_dialog_show(GTK_WINDOW(app_priv->window)); } static char** -get_account_set_request(TwituxApp *app) +get_account_set_request(App *app) { static const char* twitter[2] = { TYPE_TWITTER, NULL }; @@ -848,7 +833,7 @@ get_account_set_request(TwituxApp *app) static void app_account_cb(GtkWidget *widget, - TwituxApp *app) + App *app) { @@ -867,18 +852,18 @@ app_account_cb(GtkWidget *widget, static void app_preferences_cb(GtkWidget *widget, - TwituxApp *app) + App *app) { preferences_dialog_show(GTK_WINDOW(app_priv->window)); } -static void app_about_cb(GtkWidget *widget, TwituxApp *app){ +static void app_about_cb(GtkWidget *widget, App *app){ about_dialog_new(GTK_WINDOW(app_priv->window)); } static void app_help_contents_cb(GtkWidget *widget, - TwituxApp *app) + App *app) { @@ -887,7 +872,7 @@ app_help_contents_cb(GtkWidget *widget, static void app_add_friend_cb(GtkAction *item, - TwituxApp *app) + App *app) { @@ -896,14 +881,14 @@ app_add_friend_cb(GtkAction *item, static void app_show_hide_cb(GtkWidget *widget, - TwituxApp *app) + App *app) { app_toggle_visibility(); } static void app_status_icon_activate_cb(GtkStatusIcon *status_icon, - TwituxApp *app) + App *app) { app_toggle_visibility(); } @@ -912,7 +897,7 @@ static void app_status_icon_popup_menu_cb(GtkStatusIcon *status_icon, guint button, guint activate_time, - TwituxApp *app) + App *app) { gboolean show; @@ -944,7 +929,7 @@ app_status_icon_create_menu(void) app_priv->popup_menu_show_app = gtk_toggle_action_new("tray_show_app", - _("_Show Twitux"), + _("_Show "), NULL, NULL); g_signal_connect(G_OBJECT(app_priv->popup_menu_show_app), @@ -1005,7 +990,7 @@ app_create(void) app_setup(); } -TwituxApp * +App * app_get(void) { g_assert(app != NULL); @@ -1032,7 +1017,7 @@ return FALSE; static gboolean app_window_configure_event_cb(GtkWidget *widget, GdkEventConfigure *event, - TwituxApp *app) + App *app) { @@ -1047,7 +1032,7 @@ return FALSE; } static gboolean -request_accounts(TwituxApp *app, +request_accounts(App *app, GError **error) { guint i; @@ -1091,9 +1076,9 @@ return succeeded; } static void -request_username_password(TwituxApp *a) +request_username_password(App *a) { - TwituxConf *conf; + Conf *conf; conf = conf_get(); @@ -1126,7 +1111,7 @@ return; } static void -app_login(TwituxApp *a) +app_login(App *a) { #ifdef HAVE_DBUS @@ -1156,7 +1141,7 @@ app_login(TwituxApp *a) * timeline in the menu. */ static void -app_set_default_timeline(TwituxApp *app, gchar *timeline) +app_set_default_timeline(App *app, gchar *timeline) { /* This shouldn't happen, but just in case */ if(G_STR_EMPTY(timeline)) { @@ -1164,11 +1149,9 @@ app_set_default_timeline(TwituxApp *app, gchar *timeline) return; } + if( !(strcmp( timeline, "combined" )) ) + return gtk_radio_action_set_current_value( app_priv->menu_combined, 1); - /* redundancy is a waste of time - * if(strcmp(timeline, API_TWITTER_TIMELINE_FRIENDS) == 0) - * gtk_radio_action_set_current_value(app_priv->menu_friends, 1); - */ if( !(strcmp( timeline, API_TWITTER_TIMELINE_PUBLIC )) ) return gtk_radio_action_set_current_value( app_priv->menu_public, 1); @@ -1214,7 +1197,7 @@ app_check_dir(void) } static void -app_connection_items_setup(TwituxApp *app, +app_connection_items_setup(App *app, GtkBuilder *ui) { GList *list; src/app.c @@ -37,32 +37,32 @@ G_BEGIN_DECLS #define TYPE_APP (app_get_type ()) -#define APP(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_APP, TwituxApp)) -#define APP_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), TYPE_APP, TwituxAppClass)) +#define APP(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_APP, App)) +#define APP_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), TYPE_APP, AppClass)) #define IS_APP(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_APP)) #define IS_APP_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TYPE_APP)) -#define IS_APP_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_APP, TwituxAppClass)) +#define IS_APP_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_APP, AppClass)) -typedef struct _TwituxApp TwituxApp; -typedef struct _TwituxAppClass TwituxAppClass; -typedef struct _TwituxAppPriv TwituxAppPriv; +typedef struct _App App; +typedef struct _AppClass AppClass; +typedef struct _AppPriv AppPriv; -struct _TwituxApp { +struct _App { GObject parent; }; -struct _TwituxAppClass { +struct _AppClass { GObjectClass parent_class; }; GType app_get_type (void) G_GNUC_CONST; void app_create (void); -TwituxApp * app_get (void); +App * app_get (void); GtkWidget * app_get_window (void); void app_set_visibility (gboolean visible); void app_set_statusbar_msg (gchar *message); void app_set_friends (GList *friends); -void app_add_friend (TwituxUser *user); +void app_add_friend (User *user); void app_notify_sound (void); void app_notify (gchar *msg); void app_state_on_connection (gboolean connected); src/app.h @@ -124,7 +124,7 @@ avatar_get_gtype (void) static GType type_id = 0; if (!type_id) { - type_id = g_boxed_type_register_static ("TwituxAvatar", + type_id = g_boxed_type_register_static ("Avatar", (GBoxedCopyFunc) avatar_ref, (GBoxedFreeFunc) avatar_unref); } @@ -132,18 +132,18 @@ avatar_get_gtype (void) return type_id; } -TwituxAvatar * +Avatar * avatar_new (guchar *data, gsize len, gchar *format) { - TwituxAvatar *avatar; + Avatar *avatar; g_return_val_if_fail (data != NULL, NULL); g_return_val_if_fail (len > 0, NULL); g_return_val_if_fail (format != NULL, NULL); - avatar = g_slice_new0 (TwituxAvatar); + avatar = g_slice_new0 (Avatar); avatar->data = g_memdup (data, len); avatar->len = len; avatar->format = g_strdup (format); @@ -153,7 +153,7 @@ avatar_new (guchar *data, } static GdkPixbuf * -avatar_create_pixbuf (TwituxAvatar *avatar, gint size) +avatar_create_pixbuf (Avatar *avatar, gint size) { GdkPixbuf *tmp_pixbuf; GdkPixbuf *ret_pixbuf; @@ -214,7 +214,7 @@ avatar_create_pixbuf (TwituxAvatar *avatar, gint size) } GdkPixbuf * -avatar_get_pixbuf (TwituxAvatar *avatar) +avatar_get_pixbuf (Avatar *avatar) { g_return_val_if_fail (avatar != NULL, NULL); @@ -226,13 +226,13 @@ avatar_get_pixbuf (TwituxAvatar *avatar) } GdkPixbuf * -avatar_create_pixbuf_with_size (TwituxAvatar *avatar, gint size) +avatar_create_pixbuf_with_size (Avatar *avatar, gint size) { return avatar_create_pixbuf (avatar, size); } void -avatar_unref (TwituxAvatar *avatar) +avatar_unref (Avatar *avatar) { g_return_if_fail (avatar != NULL); @@ -245,12 +245,12 @@ avatar_unref (TwituxAvatar *avatar) g_object_unref (avatar->pixbuf); } - g_slice_free (TwituxAvatar, avatar); + g_slice_free (Avatar, avatar); } } -TwituxAvatar * -avatar_ref (TwituxAvatar *avatar) +Avatar * +avatar_ref (Avatar *avatar) { g_return_val_if_fail (avatar != NULL, NULL); src/avatar.c @@ -29,9 +29,9 @@ G_BEGIN_DECLS #define TYPE_AVATAR (avatar_get_gtype ()) -typedef struct _TwituxAvatar TwituxAvatar; +typedef struct _Avatar Avatar; -struct _TwituxAvatar { +struct _Avatar { guchar *data; gsize len; gchar *format; @@ -40,15 +40,15 @@ struct _TwituxAvatar { }; GType avatar_get_gtype (void) G_GNUC_CONST; -TwituxAvatar * avatar_new (guchar *avatar, +Avatar * avatar_new (guchar *avatar, gsize len, gchar *format); -GdkPixbuf * avatar_get_pixbuf (TwituxAvatar *avatar); -GdkPixbuf * avatar_create_pixbuf_with_size (TwituxAvatar *avatar, +GdkPixbuf * avatar_get_pixbuf (Avatar *avatar); +GdkPixbuf * avatar_create_pixbuf_with_size (Avatar *avatar, gint size); -TwituxAvatar * avatar_ref (TwituxAvatar *avatar); -void avatar_unref (TwituxAvatar *avatar); +Avatar * avatar_ref (Avatar *avatar); +void avatar_unref (Avatar *avatar); G_END_DECLS src/avatar.h @@ -35,27 +35,27 @@ #define CONF_ROOT "/apps/greet-tweet-know" #define DESKTOP_INTERFACE_ROOT "/desktop/gnome/interface" -#define GET_PRIV(obj)(G_TYPE_INSTANCE_GET_PRIVATE((obj), TYPE_CONF, TwituxConfPriv)) +#define GET_PRIV(obj)(G_TYPE_INSTANCE_GET_PRIVATE((obj), TYPE_CONF, ConfPriv)) typedef struct { GConfClient *gconf_client; -} TwituxConfPriv; +} ConfPriv; typedef struct { - TwituxConf *conf; - TwituxConfNotifyFunc func; + Conf *conf; + ConfNotifyFunc func; gpointer user_data; -} TwituxConfNotifyData; +} ConfNotifyData; static void conf_finalize(GObject *object); -G_DEFINE_TYPE(TwituxConf, conf, G_TYPE_OBJECT); +G_DEFINE_TYPE(Conf, conf, G_TYPE_OBJECT); -static TwituxConf *global_conf = NULL; -static TwituxConfPriv *config_priv=NULL; +static Conf *global_conf = NULL; +static ConfPriv *config_priv=NULL; static void -conf_class_init(TwituxConfClass *class) +conf_class_init(ConfClass *class) { GObjectClass *object_class; @@ -63,11 +63,11 @@ conf_class_init(TwituxConfClass *class) object_class->finalize = conf_finalize; - g_type_class_add_private(object_class, sizeof(TwituxConfPriv)); + g_type_class_add_private(object_class, sizeof(ConfPriv)); } static void -conf_init(TwituxConf *conf) +conf_init(Conf *conf) { config_priv = GET_PRIV(conf); @@ -100,7 +100,7 @@ conf_finalize(GObject *object) G_OBJECT_CLASS(conf_parent_class)->finalize(object); } -TwituxConf * +Conf * conf_get(void) { if(!global_conf) { @@ -120,7 +120,7 @@ conf_shutdown(void) } gboolean -conf_set_int(TwituxConf *conf, +conf_set_int(Conf *conf, const gchar *key, gint value) { @@ -137,7 +137,7 @@ conf_set_int(TwituxConf *conf, } gboolean -conf_get_int(TwituxConf *conf, +conf_get_int(Conf *conf, const gchar *key, gint *value) { @@ -165,7 +165,7 @@ conf_get_int(TwituxConf *conf, } gboolean -conf_set_bool(TwituxConf *conf, +conf_set_bool(Conf *conf, const gchar *key, gboolean value) { @@ -183,7 +183,7 @@ conf_set_bool(TwituxConf *conf, } gboolean -conf_get_bool(TwituxConf *conf, +conf_get_bool(Conf *conf, const gchar *key, gboolean *value) { @@ -212,7 +212,7 @@ conf_get_bool(TwituxConf *conf, } gboolean -conf_set_string(TwituxConf *conf, +conf_set_string(Conf *conf, const gchar *key, const gchar *value) { @@ -230,7 +230,7 @@ conf_set_string(TwituxConf *conf, } gboolean -conf_get_string(TwituxConf *conf, +conf_get_string(Conf *conf, const gchar *key, gchar **value) { @@ -257,7 +257,7 @@ conf_get_string(TwituxConf *conf, } gboolean -conf_set_string_list(TwituxConf *conf, +conf_set_string_list(Conf *conf, const gchar *key, GSList *value) { @@ -273,7 +273,7 @@ conf_set_string_list(TwituxConf *conf, } gboolean -conf_get_string_list(TwituxConf *conf, +conf_get_string_list(Conf *conf, const gchar *key, GSList **value) { @@ -297,10 +297,10 @@ conf_get_string_list(TwituxConf *conf, } static void -conf_notify_data_free(TwituxConfNotifyData *data) +conf_notify_data_free(ConfNotifyData *data) { g_object_unref(data->conf); - g_slice_free(TwituxConfNotifyData, data); + g_slice_free(ConfNotifyData, data); } static void @@ -309,7 +309,7 @@ conf_notify_func(GConfClient *client, GConfEntry *entry, gpointer user_data) { - TwituxConfNotifyData *data; + ConfNotifyData *data; data = user_data; @@ -319,18 +319,18 @@ conf_notify_func(GConfClient *client, } guint -conf_notify_add(TwituxConf *conf, +conf_notify_add(Conf *conf, const gchar *key, - TwituxConfNotifyFunc func, + ConfNotifyFunc func, gpointer user_data) { guint id; - TwituxConfNotifyData *data; + ConfNotifyData *data; g_return_val_if_fail(IS_CONF(conf), 0); - data = g_slice_new(TwituxConfNotifyData); + data = g_slice_new(ConfNotifyData); data->func = func; data->user_data = user_data; data->conf = g_object_ref(conf); @@ -346,7 +346,7 @@ conf_notify_add(TwituxConf *conf, } gboolean -conf_notify_remove(TwituxConf *conf, +conf_notify_remove(Conf *conf, guint id) { g_return_val_if_fail(IS_CONF(conf), FALSE); src/gconf.c @@ -26,58 +26,58 @@ G_BEGIN_DECLS #define TYPE_CONF (conf_get_type ()) -#define CONF(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_CONF, TwituxConf)) -#define CONF_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TYPE_CONF, TwituxConfClass)) +#define CONF(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_CONF, Conf)) +#define CONF_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), TYPE_CONF, ConfClass)) #define IS_CONF(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_CONF)) #define IS_CONF_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TYPE_CONF)) -#define CONF_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_CONF, TwituxConfClass)) +#define CONF_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_CONF, ConfClass)) -typedef struct _TwituxConf TwituxConf; -typedef struct _TwituxConfClass TwituxConfClass; +typedef struct _Conf Conf; +typedef struct _ConfClass ConfClass; -struct _TwituxConf { +struct _Conf { GObject parent; }; -struct _TwituxConfClass { +struct _ConfClass { GObjectClass parent_class; }; -typedef void (*TwituxConfNotifyFunc) (TwituxConf *conf, +typedef void (*ConfNotifyFunc) (Conf *conf, const gchar *key, gpointer user_data); GType conf_get_type (void) G_GNUC_CONST; -TwituxConf *conf_get (void); +Conf *conf_get (void); void conf_shutdown (void); -guint conf_notify_add (TwituxConf *conf, +guint conf_notify_add (Conf *conf, const gchar *key, - TwituxConfNotifyFunc func, + ConfNotifyFunc func, gpointer data); -gboolean conf_notify_remove (TwituxConf *conf, +gboolean conf_notify_remove (Conf *conf, guint id); -gboolean conf_set_int (TwituxConf *conf, +gboolean conf_set_int (Conf *conf, const gchar *key, gint value); -gboolean conf_get_int (TwituxConf *conf, +gboolean conf_get_int (Conf *conf, const gchar *key, gint *value); -gboolean conf_set_bool (TwituxConf *conf, +gboolean conf_set_bool (Conf *conf, const gchar *key, gboolean value); -gboolean conf_get_bool (TwituxConf *conf, +gboolean conf_get_bool (Conf *conf, const gchar *key, gboolean *value); -gboolean conf_set_string (TwituxConf *conf, +gboolean conf_set_string (Conf *conf, const gchar *key, const gchar *value); -gboolean conf_get_string (TwituxConf *conf, +gboolean conf_get_string (Conf *conf, const gchar *key, gchar **value); -gboolean conf_set_string_list (TwituxConf *conf, +gboolean conf_set_string_list (Conf *conf, const gchar *key, GSList *value); -gboolean conf_get_string_list (TwituxConf *conf, +gboolean conf_get_string_list (Conf *conf, const gchar *key, GSList **value); src/gconf.h @@ -34,7 +34,7 @@ void geometry_save_for_main_window (gint x, gint y, gint w, gint h) { - TwituxConf *conf; + Conf *conf; debug (DEBUG_DOMAIN, "Saving for main window: x:%d, y:%d, w:%d, h:%d", x, y, w, h); @@ -62,7 +62,7 @@ geometry_save_for_main_window (gint x, gint y, void geometry_load_for_main_window (GtkWidget *main_window) { - TwituxConf *conf; + Conf *conf; gint x, y, w, h; debug (DEBUG_DOMAIN, "Loading window geometry..."); src/geometry.c @@ -32,8 +32,8 @@ #include "label.h" #include "network.h" -static void label_class_init (TwituxLabelClass *clas); -static void label_init (TwituxLabel *label); +static void label_class_init (LabelClass *clas); +static void label_init (Label *label); static void label_finalize (GObject *object); static void label_url_activated_cb (GtkWidget *url_label, @@ -41,10 +41,10 @@ static void label_url_activated_cb (GtkWidget *url_label, gpointer user_data); static char* label_msg_get_string (const char * message); -G_DEFINE_TYPE (TwituxLabel, label, SEXY_TYPE_URL_LABEL); +G_DEFINE_TYPE (Label, label, SEXY_TYPE_URL_LABEL); static void -label_class_init (TwituxLabelClass *clas) +label_class_init (LabelClass *clas) { GObjectClass *object_class = G_OBJECT_CLASS (clas); @@ -54,7 +54,7 @@ label_class_init (TwituxLabelClass *clas) } static void -label_init (TwituxLabel *label) +label_init (Label *label) { gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); @@ -94,7 +94,7 @@ label_new (void) } void -label_set_text (TwituxLabel *nav, +label_set_text (Label *nav, const gchar *text) { gchar *parsed_text; src/label.c @@ -29,30 +29,30 @@ G_BEGIN_DECLS /* - * TwituxLabel + * Label */ #define TYPE_LABEL (label_get_type ()) -#define LABEL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_LABEL, TwituxLabel)) -#define LABEL_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), TYPE_LABEL, TwituxLabelClass)) +#define LABEL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_LABEL, Label)) +#define LABEL_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), TYPE_LABEL, LabelClass)) #define IS_LABEL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_LABEL)) #define IS_LABEL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TYPE_LABEL)) -#define LABEL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_LABEL, TwituxLabelClass)) +#define LABEL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_LABEL, LabelClass)) -typedef struct _TwituxLabel TwituxLabel; -typedef struct _TwituxLabelClass TwituxLabelClass; -typedef struct _TwituxLabelPriv TwituxLabelPriv; +typedef struct _Label Label; +typedef struct _LabelClass LabelClass; +typedef struct _LabelPriv LabelPriv; -struct _TwituxLabel { +struct _Label { SexyUrlLabel parent; }; -struct _TwituxLabelClass { +struct _LabelClass { SexyUrlLabelClass parent_class; }; GType label_get_type (void) G_GNUC_CONST; GtkWidget* label_new (void); -void label_set_text (TwituxLabel *nav, +void label_set_text (Label *nav, const gchar *text); G_END_DECLS src/label.h @@ -47,40 +47,40 @@ typedef struct { GtkTreeView *following_list; GtkTreeModel *following_store; -} TwituxLists; +} Lists; static void lists_rem_response_cb (GtkButton *button, - TwituxLists *lists); + Lists *lists); static void lists_response_cb (GtkWidget *widget, gint response, - TwituxLists *lists); + Lists *lists); static void lists_destroy_cb (GtkWidget *widget, - TwituxLists *lists); + Lists *lists); -static TwituxLists *lists; +static Lists *lists; static void lists_response_cb (GtkWidget *widget, gint response, - TwituxLists *lists) + Lists *lists) { gtk_widget_destroy (widget); } static void lists_destroy_cb (GtkWidget *widget, - TwituxLists *lists) + Lists *lists) { g_free (lists); } static void lists_rem_response_cb (GtkButton *button, - TwituxLists *lists) + Lists *lists) { GtkTreeSelection *sel; GtkTreeIter iter; - TwituxUser *user; + User *user; /* Get selected Iter */ sel = gtk_tree_view_get_selection (lists->following_list); @@ -102,7 +102,7 @@ static void list_follower_activated_cb (GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, - TwituxLists *lists) + Lists *lists) { GtkTreeIter iter; gchar *username; @@ -125,14 +125,14 @@ list_follower_activated_cb (GtkTreeView *tree_view, void lists_dialog_load_lists (GList *users) { - TwituxUser *user; + User *user; GtkTreeIter iter; GList *list; /* Following */ for (list = users; list; list = list->next) { - user = (TwituxUser *)list->data; + user = (User *)list->data; gtk_list_store_append (GTK_LIST_STORE (lists->following_store), &iter); gtk_list_store_set (GTK_LIST_STORE (lists->following_store), @@ -154,7 +154,7 @@ lists_dialog_show (GtkWindow *parent) GList *friends; GdkCursor *cursor; - lists = g_new0 (TwituxLists, 1); + lists = g_new0 (Lists, 1); /* Get widgets */ ui = glade_get_file (GLADE_FILE, src/lists-dialog.c @@ -47,7 +47,7 @@ typedef struct { gchar *src; GtkTreeIter iter; -} TwituxImage; +} Image; static void network_get_data( const gchar *url, SoupSessionCallback callback, gpointer data); static void network_post_data( const gchar *url, gchar *formdata, SoupSessionCallback callback, gpointer data ); @@ -67,7 +67,7 @@ static void network_cb_on_auth( SoupSession *session, SoupMessage *msg, SoupAuth /* Copyright (C) 2009 Kaity G. B. <uberChick@uberChicGeekChick.Com> */ GList *network_get_users_glist(gboolean get_friends); static gboolean network_get_users_page(SoupMessage *msg ); -static int network_sort_users(TwituxUser *a, TwituxUser *b); +static int network_sort_users(User *a, User *b); static void network_make_users_list(gboolean friends); GList *all_users=NULL; /* My, Kaity G. B., new stuff ends here. */ @@ -89,7 +89,7 @@ static gchar *global_password = NULL; void network_new (void) { - TwituxConf *conf; + Conf *conf; gboolean check_proxy = FALSE; /* Close previous networking */ @@ -276,13 +276,13 @@ network_get_timeline (const gchar *url_timeline) if (processing) return; - parser_reset_lastid (); + parser_reset_lastid(); /* UI */ - app_set_statusbar_msg (_("Loading timeline...")); + app_set_statusbar_msg(_("Loading timeline...")); - processing = TRUE; - network_get_data (url_timeline, network_cb_on_timeline, g_strdup(url_timeline)); + processing=TRUE; + network_get_data(url_timeline, network_cb_on_timeline, g_strdup(url_timeline)); } /* Get a user timeline */ @@ -346,7 +346,19 @@ GList *network_get_users_glist(gboolean get_friends){ network_make_users_list(get_friends); return NULL; -} +}//network_get_users_glist + +void network_get_combined_timeline(void){ + SoupMessage *msg; + char *timeline[3]={ {API_TWITTER_TIMELINE_FRIENDS}, {API_TWITTER_REPLIES}, {API_TWITTER_DIRECT_MESSAGES} }; + + for(int i=0; i<3; i++) + network_get_data(timeline[i], network_cb_on_timeline, g_strdup(timeline[i])); + /*{ msg=soup_message_new("GET", timeline[i]); + soup_session_send_message(soup_connection, msg); + }*/ + current_timeline=g_strdup("combined"); +}//network_get_combined_timeline static gboolean network_get_users_page(SoupMessage *msg){ @@ -371,7 +383,7 @@ static gboolean network_get_users_page(SoupMessage *msg){ } -static int network_sort_users(TwituxUser *a, TwituxUser *b){ +static int network_sort_users(User *a, User *b){ return g_strcmp0(a->screen_name,b->screen_name); } @@ -401,7 +413,7 @@ static void network_make_users_list( gboolean friends ){ void network_get_image (const gchar *url_image, GtkTreeIter iter){ gchar *image_file, **image_name_info; - TwituxImage *image; + Image *image; /* save using the filename */ image_name_info=g_strsplit(url_image, (const gchar *)"/", 7); @@ -423,7 +435,7 @@ void network_get_image (const gchar *url_image, GtkTreeIter iter){ return; } - image=g_new0(TwituxImage, 1); + image=g_new0(Image, 1); image->src=g_strdup(image_file); image->iter=iter; @@ -453,7 +465,7 @@ network_add_user (const gchar *username) /* Add a user to follow */ void -network_del_user (TwituxUser *user) +network_del_user (User *user) { gchar *url; @@ -545,12 +557,12 @@ static void network_free_user_list_each (gpointer user, gpointer data) { - TwituxUser *usr; + User *usr; if (!user) return; - usr = (TwituxUser *)user; + usr = (User *)user; parser_free_user (user); } @@ -697,7 +709,7 @@ network_cb_on_image (SoupSession *session, SoupMessage *msg, gpointer user_data) { - TwituxImage *image = (TwituxImage *)user_data; + Image *image = (Image *)user_data; debug (DEBUG_DOMAIN, "Image response: %i", msg->status_code); @@ -725,7 +737,7 @@ network_cb_on_add (SoupSession *session, SoupMessage *msg, gpointer user_data) { - TwituxUser *user; + User *user; debug (DEBUG_DOMAIN, "Add user response: %i", msg->status_code); @@ -765,7 +777,7 @@ network_cb_on_del (SoupSession *session, } if (user_data) { - TwituxUser *user = (TwituxUser *)user_data; + User *user = (User *)user_data; user_friends = g_list_remove (user_friends, user); parser_free_user (user); } src/network.c @@ -61,6 +61,7 @@ void network_send_message (const gchar *friend, /* Get and parse a timeline */ void network_get_timeline (const gchar *url_timeline); +void network_get_combined_timeline(void); /* Retrive a user timeline. If user is null, get * authenticated user timeline*/ @@ -83,7 +84,7 @@ void network_get_image (const gchar *url_image, void network_add_user (const gchar *username); /* Remove a user */ -void network_del_user (TwituxUser *user); +void network_del_user (User *user); /* Networking */ void network_new (void); src/network.h @@ -49,14 +49,14 @@ typedef struct { - TwituxUser *user; + User *user; gchar *text; gchar *created_at; gchar *id; -} TwituxStatus; +} Status; -static TwituxUser *parser_node_user (xmlNode *a_node); -static TwituxStatus *parser_node_status (xmlNode *a_node); +static User *parser_node_user (xmlNode *a_node); +static Status *parser_node_status (xmlNode *a_node); static xmlDoc *parser_parse (const char *data, gssize length, xmlNode **first_element); @@ -108,7 +108,7 @@ parser_users_list (const gchar *data, GList *friends = NULL; - TwituxUser *user; + User *user; /* parse the xml */ doc = parser_parse (data, length, &root_element); @@ -141,13 +141,13 @@ parser_users_list (const gchar *data, /* Parse a xml user node. Ex: add/del users responses */ -TwituxUser * +User * parser_single_user (const gchar *data, gssize length) { xmlDoc *doc = NULL; xmlNode *root_element = NULL; - TwituxUser *user = NULL; + User *user = NULL; /* parse the xml */ doc = parser_parse (data, length, &root_element); @@ -190,7 +190,7 @@ parser_timeline (const gchar *data, GtkListStore *store = NULL; GtkTreeIter iter; - TwituxStatus *status; + Status *status; /* Count new tweets */ gboolean show_notification = (last_id > 0); @@ -311,15 +311,15 @@ parser_timeline (const gchar *data, return TRUE; } -static TwituxUser * +static User * parser_node_user (xmlNode *a_node) { xmlNode *cur_node = NULL; xmlBufferPtr buffer; - TwituxUser *user; + User *user; buffer = xmlBufferCreate (); - user = g_new0 (TwituxUser, 1); + user = g_new0 (User, 1); /* Begin 'users' node loop */ for (cur_node = a_node; cur_node; cur_node = cur_node->next) { @@ -359,15 +359,15 @@ parser_node_user (xmlNode *a_node) } -static TwituxStatus * +static Status * parser_node_status (xmlNode *a_node) { xmlNode *cur_node = NULL; xmlBufferPtr buffer; - TwituxStatus *status; + Status *status; buffer = xmlBufferCreate (); - status = g_new0 (TwituxStatus, 1); + status = g_new0 (Status, 1); /* Begin 'status' or 'direct-messages' loop */ for (cur_node = a_node; cur_node; cur_node = cur_node->next) { @@ -484,7 +484,7 @@ parser_convert_time (const char *datetime) /* Free a user struct */ void -parser_free_user (TwituxUser *user) +parser_free_user (User *user) { if (!user) return; src/parser.c @@ -29,7 +29,7 @@ typedef struct { gchar *screen_name; gchar *name; gchar *image_url; -} TwituxUser; +} User; /* Returns a liststore for the main treeview to show tweets */ @@ -42,11 +42,11 @@ GList *parser_users_list (const gchar *data, gssize length); /* Parse a xml user node. Ex: add/del users responses */ -TwituxUser *parser_single_user (const gchar *data, +User *parser_single_user (const gchar *data, gssize length); /* To free a User struct */ -void parser_free_user (TwituxUser *user); +void parser_free_user (User *user); /* Restet the ID of the last tweet showed */ void parser_reset_lastid (void); src/parser.h @@ -57,7 +57,7 @@ typedef struct { GtkWidget *spell; GList *notify_ids; -} TwituxPrefs; +} Prefs; typedef struct _reload_time { gint minutes; @@ -86,55 +86,55 @@ enum { COL_COMBO_COUNT }; -static void preferences_setup_widgets (TwituxPrefs *prefs); -static void preferences_languages_add (TwituxPrefs *prefs); -static void preferences_languages_save (TwituxPrefs *prefs); +static void preferences_setup_widgets (Prefs *prefs); +static void preferences_languages_add (Prefs *prefs); +static void preferences_languages_save (Prefs *prefs); static gboolean preferences_languages_save_foreach (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gchar **languages); -static void preferences_languages_load (TwituxPrefs *prefs); +static void preferences_languages_load (Prefs *prefs); static gboolean preferences_languages_load_foreach (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gchar **languages); static void preferences_languages_cell_toggled_cb (GtkCellRendererToggle *cell, gchar *path_string, - TwituxPrefs *prefs); -static void preferences_timeline_setup (TwituxPrefs *prefs); + Prefs *prefs); +static void preferences_timeline_setup (Prefs *prefs); static void preferences_widget_sync_bool (const gchar *key, GtkWidget *widget); static void preferences_widget_sync_string_combo (const gchar *key, GtkWidget *widget); static void preferences_widget_sync_int_combo (const gchar *key, GtkWidget *widget); -static void preferences_notify_bool_cb (TwituxConf *conf, +static void preferences_notify_bool_cb (Conf *conf, const gchar *key, gpointer user_data); -static void preferences_notify_string_combo_cb (TwituxConf *conf, +static void preferences_notify_string_combo_cb (Conf *conf, const gchar *key, gpointer user_data); -static void preferences_notify_int_combo_cb (TwituxConf *conf, +static void preferences_notify_int_combo_cb (Conf *conf, const gchar *key, gpointer user_data); -static void preferences_notify_sensitivity_cb (TwituxConf *conf, +static void preferences_notify_sensitivity_cb (Conf *conf, const gchar *key, gpointer user_data); -static void preferences_hookup_toggle_button (TwituxPrefs *prefs, +static void preferences_hookup_toggle_button (Prefs *prefs, const gchar *key, GtkWidget *widget); -static void preferences_hookup_string_combo (TwituxPrefs *prefs, +static void preferences_hookup_string_combo (Prefs *prefs, const gchar *key, GtkWidget *widget); -static void preferences_hookup_int_combo (TwituxPrefs *prefs, +static void preferences_hookup_int_combo (Prefs *prefs, const gchar *key, GtkWidget *widget); -static void preferences_hookup_sensitivity (TwituxPrefs *prefs, +static void preferences_hookup_sensitivity (Prefs *prefs, const gchar *key, GtkWidget *widget); static void preferences_response_cb (GtkWidget *widget, gint response, - TwituxPrefs *prefs); + Prefs *prefs); static void preferences_toggle_button_toggled_cb (GtkWidget *button, gpointer user_data); static void preferences_string_combo_changed_cb (GtkWidget *button, @@ -142,10 +142,10 @@ static void preferences_string_combo_changed_cb (GtkWidget *butt static void preferences_int_combo_changed_cb (GtkWidget *combo, gpointer user_data); static void preferences_destroy_cb (GtkWidget *widget, - TwituxPrefs *prefs); + Prefs *prefs); static void -preferences_setup_widgets (TwituxPrefs *prefs) +preferences_setup_widgets (Prefs *prefs) { preferences_hookup_toggle_button (prefs, PREFS_TWEETS_SHOW_NAMES, @@ -184,7 +184,7 @@ preferences_setup_widgets (TwituxPrefs *prefs) prefs->combo_reload); } static void -preferences_languages_setup (TwituxPrefs *prefs) +preferences_languages_setup (Prefs *prefs) { GtkTreeView *view; GtkListStore *store; @@ -239,7 +239,7 @@ preferences_languages_setup (TwituxPrefs *prefs) } static void -preferences_languages_add (TwituxPrefs *prefs) +preferences_languages_add (Prefs *prefs) { GtkTreeView *view; GtkListStore *store; @@ -272,7 +272,7 @@ preferences_languages_add (TwituxPrefs *prefs) } static void -preferences_languages_save (TwituxPrefs *prefs) +preferences_languages_save (Prefs *prefs) { GtkTreeView *view; GtkTreeModel *model; @@ -335,7 +335,7 @@ preferences_languages_save_foreach (GtkTreeModel *model, } static void -preferences_languages_load (TwituxPrefs *prefs) +preferences_languages_load (Prefs *prefs) { GtkTreeView *view; GtkTreeModel *model; @@ -396,7 +396,7 @@ preferences_languages_load_foreach (GtkTreeModel *model, static void preferences_languages_cell_toggled_cb (GtkCellRendererToggle *cell, gchar *path_string, - TwituxPrefs *prefs) + Prefs *prefs) { GtkTreeView *view; GtkTreeModel *model; @@ -423,7 +423,7 @@ preferences_languages_cell_toggled_cb (GtkCellRendererToggle *cell, } static void -preferences_notify_bool_cb (TwituxConf *conf, +preferences_notify_bool_cb (Conf *conf, const gchar *key, gpointer user_data) { @@ -431,7 +431,7 @@ preferences_notify_bool_cb (TwituxConf *conf, } static void -preferences_timeline_setup (TwituxPrefs *prefs) +preferences_timeline_setup (Prefs *prefs) { static const gchar *timelines[] = { API_TWITTER_TIMELINE_PUBLIC, N_("Public"), @@ -470,7 +470,7 @@ preferences_timeline_setup (TwituxPrefs *prefs) } static void -preferences_reload_setup (TwituxPrefs *prefs) +preferences_reload_setup (Prefs *prefs) { GtkListStore *model; GtkTreeIter iter; @@ -602,7 +602,7 @@ preferences_widget_sync_int_combo (const gchar *key, GtkWidget *widget) } static void -preferences_notify_string_combo_cb (TwituxConf *conf, +preferences_notify_string_combo_cb (Conf *conf, const gchar *key, gpointer user_data) { @@ -610,7 +610,7 @@ preferences_notify_string_combo_cb (TwituxConf *conf, } static void -preferences_notify_int_combo_cb (TwituxConf *conf, +preferences_notify_int_combo_cb (Conf *conf, const gchar *key, gpointer user_data) { @@ -618,7 +618,7 @@ preferences_notify_int_combo_cb (TwituxConf *conf, } static void -preferences_notify_sensitivity_cb (TwituxConf *conf, +preferences_notify_sensitivity_cb (Conf *conf, const gchar *key, gpointer user_data) { @@ -630,14 +630,14 @@ preferences_notify_sensitivity_cb (TwituxConf *conf, } static void -preferences_add_id (TwituxPrefs *prefs, guint id) +preferences_add_id (Prefs *prefs, guint id) { prefs->notify_ids = g_list_prepend (prefs->notify_ids, GUINT_TO_POINTER (id)); } static void -preferences_hookup_toggle_button (TwituxPrefs *prefs, +preferences_hookup_toggle_button (Prefs *prefs, const gchar *key, GtkWidget *widget) { @@ -664,7 +664,7 @@ preferences_hookup_toggle_button (TwituxPrefs *prefs, } static void -preferences_hookup_string_combo (TwituxPrefs *prefs, +preferences_hookup_string_combo (Prefs *prefs, const gchar *key, GtkWidget *widget) { @@ -690,7 +690,7 @@ preferences_hookup_string_combo (TwituxPrefs *prefs, } static void -preferences_hookup_int_combo (TwituxPrefs *prefs, +preferences_hookup_int_combo (Prefs *prefs, const gchar *key, GtkWidget *widget) { @@ -717,7 +717,7 @@ preferences_hookup_int_combo (TwituxPrefs *prefs, } static void -preferences_hookup_sensitivity (TwituxPrefs *prefs, +preferences_hookup_sensitivity (Prefs *prefs, const gchar *key, GtkWidget *widget) { @@ -798,13 +798,13 @@ preferences_int_combo_changed_cb (GtkWidget *combo, static void preferences_response_cb (GtkWidget *widget, gint response, - TwituxPrefs *prefs) + Prefs *prefs) { gtk_widget_destroy (widget); } static void preferences_destroy_cb (GtkWidget *widget, - TwituxPrefs *prefs) + Prefs *prefs) { GList *l; @@ -822,7 +822,7 @@ preferences_destroy_cb (GtkWidget *widget, void preferences_dialog_show (GtkWindow *parent) { - static TwituxPrefs *prefs; + static Prefs *prefs; GtkBuilder *ui; if (prefs) { @@ -830,7 +830,7 @@ preferences_dialog_show (GtkWindow *parent) return; } - prefs = g_new0 (TwituxPrefs, 1); + prefs = g_new0 (Prefs, 1); /* Get widgets */ ui = glade_get_file (GLADE_FILE, src/preferences.c @@ -50,7 +50,7 @@ #define MAX_CHARACTER_COUNT 140 #define GET_PRIV(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_MESSAGE, TwituxMsgDialogPriv)) + (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TYPE_MESSAGE, MsgDialogPriv)) typedef struct { GtkWidget *textview; @@ -58,9 +58,9 @@ typedef struct { GtkTextIter start; GtkTextIter end; -} TwituxMessageSpell; +} MessageSpell; -struct _TwituxMsgDialogPriv { +struct _MsgDialogPriv { /* Main widgets */ GtkWidget *dialog; GtkWidget *textview; @@ -72,15 +72,15 @@ struct _TwituxMsgDialogPriv { gboolean show_friends; }; -static void message_class_init( TwituxMsgDialogClass *klass ); -static void message_init( TwituxMsgDialog *signelton_message ); +static void message_class_init( MsgDialogClass *klass ); +static void message_init( MsgDialog *signelton_message ); static void message_finalize( GObject *object ); static void message_setup( GtkWindow *parent ); static void message_set_characters_available( GtkTextBuffer *buffer ); static void message_text_buffer_changed_cb ( GtkTextBuffer *buffer ); -static void message_text_check_word_spelling_cb( GtkMenuItem *menuitem, TwituxMessageSpell *message_spell ); -static TwituxMessageSpell *message_spell_new( GtkWidget *window, const gchar *word, GtkTextIter start, GtkTextIter end); -static void message_spell_free( TwituxMessageSpell *message_spell ); +static void message_text_check_word_spelling_cb( GtkMenuItem *menuitem, MessageSpell *message_spell ); +static MessageSpell *message_spell_new( GtkWidget *window, const gchar *word, GtkTextIter start, GtkTextIter end); +static void message_spell_free( MessageSpell *message_spell ); static void message_destroy_cb( GtkWidget *widget ); static void message_response_cb( GtkWidget *widget, gint response ); @@ -89,21 +89,21 @@ static void message_text_populate_popup_cb( GtkTextView *view, GtkMenu *menu ); static GtkTextBuffer *undo_buffer=NULL; -static TwituxMsgDialog *dialog = NULL; -static TwituxMsgDialogPriv *dialog_priv=NULL; -G_DEFINE_TYPE (TwituxMsgDialog, message, G_TYPE_OBJECT); +static MsgDialog *dialog = NULL; +static MsgDialogPriv *dialog_priv=NULL; +G_DEFINE_TYPE (MsgDialog, message, G_TYPE_OBJECT); static void -message_class_init (TwituxMsgDialogClass *klass) +message_class_init (MsgDialogClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); object_class->finalize = message_finalize; - g_type_class_add_private (object_class, sizeof (TwituxMsgDialogPriv)); + g_type_class_add_private (object_class, sizeof (MsgDialogPriv)); } -static void message_init( TwituxMsgDialog *singleton_message ){ +static void message_init( MsgDialog *singleton_message ){ dialog=singleton_message; dialog_priv=GET_PRIV( dialog ); } @@ -228,7 +228,7 @@ message_set_followers (GList *followers) { GList *list; GtkTreeIter iter; - TwituxUser *user; + User *user; GtkListStore *model_followers; model_followers = @@ -236,7 +236,7 @@ message_set_followers (GList *followers) GTK_COMBO_BOX (dialog_priv->friends_combo))); for (list = followers; list; list = list->next) { - user = (TwituxUser *)list->data; + user = (User *)list->data; gtk_list_store_append (model_followers, &iter); gtk_list_store_set (model_followers, &iter, @@ -437,7 +437,7 @@ static void message_text_populate_popup_cb( GtkTextView *view, GtkMenu *menu ){ GtkTextIter iter, start, end; GtkWidget *item; gchar *str=NULL; - TwituxMessageSpell *message_spell; + MessageSpell *message_spell; /* Find where the cursor's location, ie where you're typing. */ GtkTextMark *cursor_position=gtk_text_buffer_get_insert( buffer ); @@ -474,7 +474,7 @@ static void message_text_populate_popup_cb( GtkTextView *view, GtkMenu *menu ){ static void message_text_check_word_spelling_cb (GtkMenuItem *menuitem, - TwituxMessageSpell *chat_spell) + MessageSpell *chat_spell) { spell_dialog_show (chat_spell->textview, chat_spell->start, @@ -482,15 +482,15 @@ message_text_check_word_spelling_cb (GtkMenuItem *menuitem, chat_spell->word); } -static TwituxMessageSpell * +static MessageSpell * message_spell_new (GtkWidget *textview, const gchar *word, GtkTextIter start, GtkTextIter end) { - TwituxMessageSpell *message_spell; + MessageSpell *message_spell; - message_spell = g_new0 (TwituxMessageSpell, 1); + message_spell = g_new0 (MessageSpell, 1); message_spell->textview = textview; message_spell->word = g_strdup (word); @@ -501,7 +501,7 @@ message_spell_new (GtkWidget *textview, } static void -message_spell_free (TwituxMessageSpell *message_spell) +message_spell_free (MessageSpell *message_spell) { g_free (message_spell->word); g_free (message_spell); src/send-message-dialog.c @@ -34,21 +34,21 @@ G_BEGIN_DECLS #define TYPE_MESSAGE (message_get_type ()) -#define MESSAGE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_MESSAGE, TwituxMsgDialog)) -#define MESSAGE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), TYPE_MESSAGE, TwituxMsgDialogClass)) +#define MESSAGE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_MESSAGE, MsgDialog)) +#define MESSAGE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), TYPE_MESSAGE, MsgDialogClass)) #define IS_MESSAGE(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_MESSAGE)) #define IS_MESSAGE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TYPE_MESSAGE)) -#define IS_MESSAGE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_MESSAGE, TwituxMsgDialogClass)) +#define IS_MESSAGE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_MESSAGE, MsgDialogClass)) -typedef struct _TwituxMsgDialog TwituxMsgDialog; -typedef struct _TwituxMsgDialogClass TwituxMsgDialogClass; -typedef struct _TwituxMsgDialogPriv TwituxMsgDialogPriv; +typedef struct _MsgDialog MsgDialog; +typedef struct _MsgDialogClass MsgDialogClass; +typedef struct _MsgDialogPriv MsgDialogPriv; -struct _TwituxMsgDialog { +struct _MsgDialog { GObject parent; }; -struct _TwituxMsgDialogClass { +struct _MsgDialogClass { GObjectClass parent_class; }; src/send-message-dialog.h @@ -55,30 +55,30 @@ typedef struct { gchar *word; GtkTextIter start; GtkTextIter end; -} TwituxSpellDialog; +} SpellDialog; enum { COL_SPELL_WORD, COL_SPELL_COUNT }; -static void spell_dialog_model_populate_columns (TwituxSpellDialog *dialog); -static void spell_dialog_model_populate_suggestions (TwituxSpellDialog *dialog); +static void spell_dialog_model_populate_columns (SpellDialog *dialog); +static void spell_dialog_model_populate_suggestions (SpellDialog *dialog); static void spell_dialog_model_row_activated_cb (GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, - TwituxSpellDialog *dialog); + SpellDialog *dialog); static void spell_dialog_model_selection_changed_cb (GtkTreeSelection *treeselection, - TwituxSpellDialog *dialog); -static void spell_dialog_model_setup (TwituxSpellDialog *dialog); + SpellDialog *dialog); +static void spell_dialog_model_setup (SpellDialog *dialog); static void spell_dialog_response_cb (GtkWidget *widget, gint response, - TwituxSpellDialog *dialog); + SpellDialog *dialog); static void spell_dialog_destroy_cb (GtkWidget *widget, - TwituxSpellDialog *dialog); + SpellDialog *dialog); static void -spell_dialog_model_populate_columns (TwituxSpellDialog *dialog) +spell_dialog_model_populate_columns (SpellDialog *dialog) { GtkTreeModel *model; GtkTreeViewColumn *column; @@ -105,7 +105,7 @@ spell_dialog_model_populate_columns (TwituxSpellDialog *dialog) } static void -spell_dialog_model_populate_suggestions (TwituxSpellDialog *dialog) +spell_dialog_model_populate_suggestions (SpellDialog *dialog) { GtkTreeModel *model; GtkListStore *store; @@ -134,14 +134,14 @@ static void spell_dialog_model_row_activated_cb (GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, - TwituxSpellDialog *dialog) + SpellDialog *dialog) { spell_dialog_response_cb (dialog->window, GTK_RESPONSE_OK, dialog); } static void spell_dialog_model_selection_changed_cb (GtkTreeSelection *treeselection, - TwituxSpellDialog *dialog) + SpellDialog *dialog) { gint count; @@ -150,7 +150,7 @@ spell_dialog_model_selection_changed_cb (GtkTreeSelection *treeselection, } static void -spell_dialog_model_setup (TwituxSpellDialog *dialog) +spell_dialog_model_setup (SpellDialog *dialog) { GtkTreeView *view; GtkListStore *store; @@ -182,7 +182,7 @@ spell_dialog_model_setup (TwituxSpellDialog *dialog) static void spell_dialog_destroy_cb (GtkWidget *widget, - TwituxSpellDialog *dialog) + SpellDialog *dialog) { g_free (dialog->word); g_free (dialog); @@ -191,7 +191,7 @@ spell_dialog_destroy_cb (GtkWidget *widget, static void spell_dialog_response_cb (GtkWidget *widget, gint response, - TwituxSpellDialog *dialog) + SpellDialog *dialog) { if (response == GTK_RESPONSE_OK) { GtkTreeView *view; @@ -227,14 +227,14 @@ spell_dialog_show (GtkWidget *textview, GtkTextIter end, const gchar *word) { - TwituxSpellDialog *dialog; + SpellDialog *dialog; GtkBuilder *ui; gchar *str; g_return_if_fail (textview != NULL); g_return_if_fail (word != NULL); - dialog = g_new0 (TwituxSpellDialog, 1); + dialog = g_new0 (SpellDialog, 1); dialog->textview = textview; src/spell-dialog.c @@ -164,7 +164,7 @@ spell_iso_code_names_init (void) } static void -spell_notify_languages_cb (TwituxConf *conf, +spell_notify_languages_cb (Conf *conf, const gchar *key, gpointer user_data) { src/spell.c @@ -37,20 +37,20 @@ #define DEBUG_DOMAIN "TweetList" #define GET_PRIV(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE((obj), TYPE_TWEET_LIST, TwituxTweetListPriv)) + (G_TYPE_INSTANCE_GET_PRIVATE((obj), TYPE_TWEET_LIST, TweetListPriv)) -struct _TwituxTweetListPriv { +struct _TweetListPriv { GtkListStore *store; GtkTreeViewColumn *text_column; GtkCellRenderer *text_renderer; }; -static void tweet_list_class_init(TwituxTweetListClass *klass); -static void tweet_list_init(TwituxTweetList *tweet); +static void tweet_list_class_init(TweetListClass *klass); +static void tweet_list_init(TweetList *tweet); static void tweet_list_finalize(GObject *obj); -static void tweet_list_create_model(TwituxTweetList *list); -static void tweet_list_setup_view(TwituxTweetList *list); +static void tweet_list_create_model(TweetList *list); +static void tweet_list_setup_view(TweetList *list); static void tweet_list_size_cb(GtkWidget *widget, GtkAllocation *allocation, gpointer user_data); @@ -60,23 +60,23 @@ static void tweet_list_activated_cb(GtkTreeView *tree_view, GtkTreePath *path, GtkTreeViewColumn *column, gpointer friends_tweet); -static TwituxTweetList *list = NULL; -static TwituxTweetListPriv *list_priv=NULL; +static TweetList *list = NULL; +static TweetListPriv *list_priv=NULL; -G_DEFINE_TYPE(TwituxTweetList, tweet_list, GTK_TYPE_TREE_VIEW); +G_DEFINE_TYPE(TweetList, tweet_list, GTK_TYPE_TREE_VIEW); static void -tweet_list_class_init(TwituxTweetListClass *klass) +tweet_list_class_init(TweetListClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS(klass); object_class->finalize = tweet_list_finalize; - g_type_class_add_private(object_class, sizeof(TwituxTweetListPriv)); + g_type_class_add_private(object_class, sizeof(TweetListPriv)); } static void -tweet_list_init(TwituxTweetList *tweet) +tweet_list_init(TweetList *tweet) { list=tweet; @@ -116,7 +116,7 @@ tweet_list_finalize(GObject *object) } static void -tweet_list_create_model(TwituxTweetList *list) +tweet_list_create_model(TweetList *list) { GtkTreeModel *model; @@ -140,7 +140,7 @@ tweet_list_create_model(TwituxTweetList *list) } static void -tweet_list_setup_view(TwituxTweetList *list) +tweet_list_setup_view(TweetList *list) { GtkCellRenderer *renderer; GtkTreeViewColumn *avatar_column; @@ -179,7 +179,7 @@ tweet_list_changed_cb(GtkWidget *widget, if(!expand) return; - TwituxTweetList *t; + TweetList *t; GtkTreeSelection *sel; GtkTreeIter iter; GdkPixbuf *pixbuf; @@ -214,7 +214,7 @@ tweet_list_size_cb(GtkWidget *widget, GtkAllocation *allocation, gpointer user_data) { - TwituxTweetList *t; + TweetList *t; t=TWEET_LIST(user_data); @@ -227,7 +227,7 @@ tweet_list_activated_cb(GtkTreeView *tree_view, GtkTreeViewColumn *column, gpointer friends_tweet) { - TwituxTweetList *t=NULL; + TweetList *t=NULL; gchar *friend=NULL; GtkTreeIter iter; @@ -249,7 +249,7 @@ tweet_list_activated_cb(GtkTreeView *tree_view, g_free(friend); } -TwituxTweetList *tweet_list_new(void){ +TweetList *tweet_list_new(void){ return g_object_new(TYPE_TWEET_LIST, NULL); } src/tweet-list.c @@ -29,29 +29,29 @@ G_BEGIN_DECLS /* - * TwituxTweetList + * TweetList */ #define TYPE_TWEET_LIST (tweet_list_get_type ()) -#define TWEET_LIST(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_TWEET_LIST, TwituxTweetList)) -#define TWEET_LIST_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), TYPE_TWEET_LIST, TwituxTweetListClass)) +#define TWEET_LIST(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TYPE_TWEET_LIST, TweetList)) +#define TWEET_LIST_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), TYPE_TWEET_LIST, TweetListClass)) #define IS_TWEET_LIST(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), TYPE_TWEET_LIST)) #define IS_TWEET_LIST_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), TYPE_TWEET_LIST)) -#define TWEET_LIST_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_TWEET_LIST, TwituxTweetListClass)) +#define TWEET_LIST_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_TWEET_LIST, TweetListClass)) -typedef struct _TwituxTweetList TwituxTweetList; -typedef struct _TwituxTweetListClass TwituxTweetListClass; -typedef struct _TwituxTweetListPriv TwituxTweetListPriv; +typedef struct _TweetList TweetList; +typedef struct _TweetListClass TweetListClass; +typedef struct _TweetListPriv TweetListPriv; -struct _TwituxTweetList { +struct _TweetList { GtkTreeView parent; }; -struct _TwituxTweetListClass { +struct _TweetListClass { GtkTreeViewClass parent_class; }; GType tweet_list_get_type (void) G_GNUC_CONST; -TwituxTweetList * tweet_list_new (void); +TweetList * tweet_list_new (void); GtkListStore * tweet_list_get_store (void); G_END_DECLS src/tweet-list.h e1d73512840ea0ba6ccfc6a43a43bc1497e98285 uberChick uberchick@uberchicgeekchick.com http://github.com/uberchicgeekchick/get2gnow/commit/7faac1096d395b578e2fade9d960666f006c8afc 7faac1096d395b578e2fade9d960666f006c8afc 2009-03-20T19:58:22-07:00 2009-03-20T19:58:22-07:00 New features: combined view & friend manager. I'm working on creating a 'view' that will combined tweets from those you follow, direct replies, and direct messages into one view. I am also adding a dialog that will compare friends & followers. It will let you see who's following you that you're not following & who you're following who's not following you back. It'll let you add, remove, block, direct message, and view their statuses. Greet-Tweet-Know is still currently stable & useable but my new features aren't working 100 Committed on: 2009-03-20 @ 08:58:21 PM af5a7d7187c097aaa20ee6027cf8366ad39ef163 uberChick uberchick@uberchicgeekchick.com